chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
79c2504
)
git-debrebase: fixes
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 14 Jul 2017 14:30:45 +0000
(15:30 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 11:25:49 +0000
(12:25 +0100)
git-debrebase
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index 21c0582a511fd6dd4041cce0e6abd00ab60ac0ae..71fb11e60f39b7ba7550efe26e63f0db40a34c9e 100755
(executable)
--- 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';