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:
ca84cb0
)
git-debrebase: merge: Save wreckage in $maindir
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 17:51:39 +0000
(18:51 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 19:11:09 +0000
(20:11 +0100)
We should change to $maindir before exiting.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index bd93fbd07eef19090da2380dcc866e6d55a3a953..213728023f249305eb873722d305f3168a1cb0c4 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-384,6
+384,8
@@
sub merge_failed ($$) {
my @m;
push @m, "Merge resolution failed: $emsg";
+ changedir $maindir;
+
my @updates;
merge_wreckage_cleaning \@updates;
keys %$wrecknotes;