diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-23 12:52:19 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-23 12:52:25 +0100 |
| commit | 459926bd714e0136281d99ac0d9f7b3d8c99fe8c (patch) | |
| tree | ac8a5cfc1d2ae53d10a482ea0029f0bc9f9f4f34 /debian | |
| parent | 19669291927ee91dbea3c47a412161b32859df88 (diff) | |
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 <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 75515ee..c0c45a1 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. -- |