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 /dgit | |
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 'dgit')
-rwxr-xr-x | dgit | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |