summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2017-07-14 15:30:45 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 12:25:49 +0100
commitde060de5abd543a46a6e08653ccbaef27c556a29 (patch)
tree1ab3a5c82831277f58547081a2684365d688c24b /git-debrebase
parent79c250465c2ed53040e59975d3396ec00825f6e7 (diff)
git-debrebase: fixes
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-debrebase b/git-debrebase
index 21c0582..71fb11e 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';