2007-12-31 07:13:52 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
2008-09-03 08:59:31 +00:00
|
|
|
test_description='git reset in a bare repository'
|
2007-12-31 07:13:52 +00:00
|
|
|
. ./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
|
|
|
|
'
|
|
|
|
|
2009-12-04 11:11:58 +00:00
|
|
|
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)
|
|
|
|
'
|
|
|
|
|
2009-12-30 08:47:03 +00:00
|
|
|
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
|
|
|
|
'
|
|
|
|
|
2007-12-31 07:13:52 +00:00
|
|
|
test_expect_success 'setup bare' '
|
|
|
|
git clone --bare . bare.git &&
|
|
|
|
cd bare.git
|
|
|
|
'
|
|
|
|
|
2009-12-04 11:11:58 +00:00
|
|
|
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^
|
2007-12-31 07:13:52 +00:00
|
|
|
'
|
|
|
|
|
2009-12-04 11:11:58 +00:00
|
|
|
test_expect_success 'soft reset is allowed in bare' '
|
2007-12-31 07:13:52 +00:00
|
|
|
git reset --soft HEAD^ &&
|
|
|
|
test "`git show --pretty=format:%s | head -n 1`" = "one"
|
|
|
|
'
|
|
|
|
|
|
|
|
test_done
|