From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 14 Jul 2017 14:30:45 +0000 (+0100)
Subject: git-debrebase: fixes
X-Git-Tag: archive/debian/5.0~329
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=de060de5abd543a46a6e08653ccbaef27c556a29

git-debrebase: fixes
---

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';