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:
27b7f56
)
git-debrebase: merge: Break out $mdebug
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 15:35:05 +0000
(16:35 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 16:05:56 +0000
(17:05 +0100)
NFC.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index 830cfd5ea978586b68a6e995936bcf68e9dac7f7..62381e1de83c8fc1440e578593f0bf8422cdb632 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-552,8
+552,8
@@
sub merge_series ($$$;@) {
runcmd @git, qw(commit --allow-empty -q -m M-INDEX);
runcmd @git, qw(add .);
runcmd @git, qw(commit --allow-empty -q -m M-WORKTREE);
- printdebug sprintf "merge_series done debug=%s\n",
-
git_rev_parse 'HEAD'
;
+ my $mdebug = git_rev_parse 'HEAD';
+
printdebug sprintf "merge_series done debug=%s\n", $mdebug
;
};
printdebug "merge_series returns $result\n";
return $result;