From 5667b2507777d1b6e22f242e9c5ed9a595540bfb Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 30 Jan 2018 18:46:33 +0000 Subject: [PATCH] git-debrebase: launder: print last upstream merge too Signed-off-by: Ian Jackson --- git-debrebase | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 () { -- 2.30.2