summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-11 18:51:39 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-11 20:11:09 +0100
commiteec3f8c097bdb3f03499c9228f42d5cd2ce65786 (patch)
treefa7e6df384b32331448c5fe6a6c02dd8e53c0900
parentca84cb09d15eade6d18c8eba1c6a3bd8c42b1f28 (diff)
git-debrebase: merge: Save wreckage in $maindir
We should change to $maindir before exiting. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-xgit-debrebase2
1 files changed, 2 insertions, 0 deletions
diff --git a/git-debrebase b/git-debrebase
index bd93fbd..2137280 100755
--- 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;