diff options
author | Conrad Irwin <conrad.irwin@gmail.com> | 2011-08-20 14:49:48 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-08-22 16:00:36 -0700 |
commit | 55c4a673070f40f2ef12d0be269e95f1df6825a9 (patch) | |
tree | f3167659326c1308f6dfe3600ec0b57200cef335 /Documentation/gitk.txt | |
parent | add technical documentation about ref iteration (diff) | |
download | tgif-55c4a673070f40f2ef12d0be269e95f1df6825a9.tar.xz |
Prevent force-updating of the current branch
"git branch -M <foo> <current-branch>" allows updating the current branch
which HEAD points, without the necessary house-keeping that git reset
normally does to make this operation sensible. It also leaves the reflog
in a confusing state (you would be warned when trying to read it).
"git checkout -B <current branch> <foo>" is also partly vulnerable to this
bug; due to inconsistent pre-flight checks it would perform half of its
task and then abort just before rewriting the branch. Again this
manifested itself as the index file getting out-of-sync with HEAD.
"git branch -f" already guarded against this problem, and aborts with
a fatal error.
Update "git branch -M", "git checkout -B" and "git branch -f" to share the
same check before allowing a branch to be created. These prevent you from
updating the current branch.
We considered suggesting the use of "git reset" in the failure message
but concluded that it was not possible to discern what the user was
actually trying to do.
Signed-off-by: Conrad Irwin <conrad.irwin@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/gitk.txt')
0 files changed, 0 insertions, 0 deletions