From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 17:51:39 +0000 (+0100)
Subject: git-debrebase: merge: Save wreckage in $maindir
X-Git-Tag: archive/debian/6.7~85
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=eec3f8c097bdb3f03499c9228f42d5cd2ce65786

git-debrebase: merge: Save wreckage in $maindir

We should change to $maindir before exiting.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/git-debrebase b/git-debrebase
index bd93fbd0..21372802 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;