chiark / gitweb /
git-debrebase: launder: print last upstream merge too
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 30 Jan 2018 18:46:33 +0000 (18:46 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 11:25:49 +0000 (12:25 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase

index dc55df8..b9cef97 100755 (executable)
@@ -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 () {