mirror of
https://github.com/git/git.git
synced 2024-11-06 01:03:02 +01:00
952dfc6944
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>
54 lines
1.1 KiB
Bash
Executable file
54 lines
1.1 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git reset in a bare repository'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup non-bare' '
|
|
echo one >file &&
|
|
git add file &&
|
|
git commit -m one &&
|
|
echo two >file &&
|
|
git commit -a -m two
|
|
'
|
|
|
|
test_expect_success 'hard reset requires a worktree' '
|
|
(cd .git &&
|
|
test_must_fail git reset --hard)
|
|
'
|
|
|
|
test_expect_success 'merge reset requires a worktree' '
|
|
(cd .git &&
|
|
test_must_fail git reset --merge)
|
|
'
|
|
|
|
test_expect_success 'mixed reset is ok' '
|
|
(cd .git && git reset)
|
|
'
|
|
|
|
test_expect_success 'soft reset is ok' '
|
|
(cd .git && git reset --soft)
|
|
'
|
|
|
|
test_expect_success 'setup bare' '
|
|
git clone --bare . bare.git &&
|
|
cd bare.git
|
|
'
|
|
|
|
test_expect_success 'hard reset is not allowed in bare' '
|
|
test_must_fail git reset --hard HEAD^
|
|
'
|
|
|
|
test_expect_success 'merge reset is not allowed in bare' '
|
|
test_must_fail git reset --merge HEAD^
|
|
'
|
|
|
|
test_expect_success 'mixed reset is not allowed in bare' '
|
|
test_must_fail git reset --mixed HEAD^
|
|
'
|
|
|
|
test_expect_success 'soft reset is allowed in bare' '
|
|
git reset --soft HEAD^ &&
|
|
test "`git show --pretty=format:%s | head -n 1`" = "one"
|
|
'
|
|
|
|
test_done
|