mirror of
https://github.com/git/git.git
synced 2024-12-03 06:53:53 +08:00
cd0f0f68e1
Commit952dfc6tried to tighten the safety valves for doing a "reset --hard" in a bare repository or outside the work tree, but accidentally broke the case for GIT_WORK_TREE. This patch unbreaks it. Most git commands which need a work tree simply use NEED_WORK_TREE in git.c to die before they get to their cmd_* function. Reset, however, only needs a work tree in some cases, and so must handle the work tree itself. The error that952dfc6made was to simply forbid certain operations if the work tree was not set up; instead, we need to do the same thing that NEED_WORK_TREE does, which is to call setup_work_tree(). We no longer have to worry about dying in the non-worktree case, as setup_work_tree handles that for us. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
61 lines
1.3 KiB
Bash
Executable File
61 lines
1.3 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 'hard reset works with GIT_WORK_TREE' '
|
|
mkdir worktree &&
|
|
GIT_WORK_TREE=$PWD/worktree GIT_DIR=$PWD/.git git reset --hard &&
|
|
test_cmp file worktree/file
|
|
'
|
|
|
|
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
|