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:
4d86963
)
git-debrebase: fix parents in generated commits (!)
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 22 Oct 2017 19:29:23 +0000
(20:29 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 16 Feb 2018 19:19:06 +0000
(19:19 +0000)
git-debrebase
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index f73bf0c1d8489e7a1535231a3eb6eab5de93d4ed..b4eb684debdbfdab8e19c27cec62fe08fc363f8c 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-665,7
+665,7
@@
sub walk ($;$$) {
$ch =~ s{^tree .*}{tree $newtree}m or confess "$ch ?";
$ch =~ s{^parent .*\n}{}m;
$ch =~ s{(?=^author)}{
- map { "parent $_\n" } @parents
+
join '',
map { "parent $_\n" } @parents
}me or confess "$ch ?";
if ($rewriting) {
$ch =~ s{^committer .*$}{$committer_authline}m