From eec3f8c097bdb3f03499c9228f42d5cd2ce65786 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 11 Aug 2018 18:51:39 +0100 Subject: [PATCH] git-debrebase: merge: Save wreckage in $maindir We should change to $maindir before exiting. Signed-off-by: Ian Jackson --- git-debrebase | 2 ++ 1 file changed, 2 insertions(+) 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; -- 2.30.2