From de060de5abd543a46a6e08653ccbaef27c556a29 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 14 Jul 2017 15:30:45 +0100 Subject: [PATCH] git-debrebase: fixes --- git-debrebase | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-debrebase b/git-debrebase index 21c0582a..71fb11e6 100755 --- a/git-debrebase +++ b/git-debrebase @@ -358,7 +358,7 @@ sub classify ($) { Contributor => $bytime[1]); } foreach my $p (@p) { - my ($p_h, $p_m) = get_commit $p; + my ($p_h, $p_m) = get_commit $p->{CommitId}; $p->{IsOrigin} = $p_h !~ m/^parent \w+$/m; ($p->{IsDgitImport},) = $p_m =~ m/^\[dgit import ([0-9a-z]+) .*\]$/m; } @@ -659,7 +659,7 @@ sub update_head ($$$) { } sub cmd_launder () { - badusage "no arguments to launder allowed"; + badusage "no arguments to launder allowed" if @ARGV; my $old = get_head(); my ($tip,$breakwater) = walk $old; update_head $old, $tip, 'launder'; -- 2.30.2