chiark / gitweb /
git-debrebase: merge: Save wreckage in $maindir
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 17:51:39 +0000 (18:51 +0100)
committerIan 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

index bd93fbd..2137280 100755 (executable)
@@ -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;