From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 30 Jan 2018 18:46:33 +0000 (+0000)
Subject: git-debrebase: launder: print last upstream merge too
X-Git-Tag: archive/debian/5.0~291
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=5667b2507777d1b6e22f242e9c5ed9a595540bfb

git-debrebase: launder: print last upstream merge too

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/git-debrebase b/git-debrebase
index dc55df8c..b9cef978 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 () {