diff options
author | Jeff King <peff@peff.net> | 2009-12-04 06:11:58 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-12-05 10:28:20 -0800 |
commit | 952dfc6944b29582482ff50a85c04879406c06ba (patch) | |
tree | 2cb74edc7a2ffe1c79149b649ba0bbd3743ef36a /t/t3201-branch-contains.sh | |
parent | Documentation: Avoid use of xmlto --stringparam (diff) | |
download | tgif-952dfc6944b29582482ff50a85c04879406c06ba.tar.xz |
reset: improve worktree safety valves
The existing code checked to make sure we were not in a bare
repository when doing a hard reset. However, we should take
this one step further, and make sure we are in a worktree.
Otherwise, we can end up munging files inside of '.git'.
Furthermore, we should do the same check for --merge resets,
which have the same properties. Actually, a merge reset of
HEAD^ would already complain, since further down in the code
we want a worktree. However, it is nicer to check up-front;
then we are sure we cover all cases ("git reset --merge"
would run, even though it wasn't doing anything) and we can
give a more specific message.
Add tests to t7103 to cover these cases and some missing ones.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3201-branch-contains.sh')
0 files changed, 0 insertions, 0 deletions