merge-recursive: never leave index unmerged while recursing
[git.git] / t / t7103-reset-bare.sh
blob42bf518c68e6ef07c8be1af714723b2f900a573c
1 #!/bin/sh
3 test_description='git reset in a bare repository'
4 . ./test-lib.sh
6 test_expect_success 'setup non-bare' '
7 echo one >file &&
8 git add file &&
9 git commit -m one &&
10 echo two >file &&
11 git commit -a -m two
14 test_expect_success 'setup bare' '
15 git clone --bare . bare.git &&
16 cd bare.git
19 test_expect_success 'hard reset is not allowed' '
20 test_must_fail git reset --hard HEAD^
23 test_expect_success 'soft reset is allowed' '
24 git reset --soft HEAD^ &&
25 test "`git show --pretty=format:%s | head -n 1`" = "one"
28 test_done