summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-01-30 18:46:33 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 12:25:49 +0100
commit5667b2507777d1b6e22f242e9c5ed9a595540bfb (patch)
tree2bdd908146089e2d181605b727e4396307efd6c5 /git-debrebase
parent8d534ac9006cef95a5b2e9e882039bcabb945543 (diff)
git-debrebase: launder: print last upstream merge too
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase
index dc55df8..b9cef97 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -764,12 +764,13 @@ sub update_head_checkout ($$$) {
sub cmd_launder () {
badusage "no arguments to launder allowed" if @ARGV;
my $old = get_head();
- my ($tip,$breakwater) = walk $old;
+ my ($tip,$breakwater,$last_upstream_merge) = walk $old;
update_head $old, $tip, 'launder';
# no tree changes except debian/patches
runcmd @git, qw(rm --quiet --ignore-unmatch -rf debian/patches);
printf "# breakwater tip\n%s\n", $breakwater;
printf "# working tip\n%s\n", $tip;
+ printf "# last upstream merge\n%s\n", $last_upstream_merge;
}
sub cmd_analyse () {