From 459926bd714e0136281d99ac0d9f7b3d8c99fe8c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 23 Oct 2016 12:52:19 +0100 Subject: [PATCH] solit brain: Do not crash in when the two brains are actually identical. The dgit-view ref is created by quiltify_splitbrain_needed, which is not always called. But, quiltify_splitbrain_needed's other function is to switch branches. If it was called then HEAD will refer to dgit-view. If it wasn't then the original HEAD is fine. Closes:#841770. Signed-off-by: Ian Jackson --- debian/changelog | 2 ++ dgit | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 75515ee2..c0c45a1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ dgit (2.5~) unstable; urgency=medium and improve performance by amortising gnupg migration cost. * Switch to new archive/ tag format by default, even in non-split-brain mode. + * Do not crash in split brain quilt modes when the two brains are + actually identical. Closes:#841770. -- diff --git a/dgit b/dgit index 6cdf8d28..5ee61ef9 100755 --- a/dgit +++ b/dgit @@ -3909,7 +3909,7 @@ Commit patch to update .gitignore END } - my $dgitview = git_rev_parse 'refs/heads/dgit-view'; + my $dgitview = git_rev_parse 'HEAD'; changedir '../../../..'; # When we no longer need to support squeeze, use --create-reflog -- 2.30.2