merge: make branch.<name>.mergeoptions correctly override merge.<option>
[git/jnareb-git.git] / t / t7103-reset-bare.sh
blobafb55b3a463f79be83c0e3cc4a8aff8a0c6676be
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 'hard reset requires a worktree' '
15 (cd .git &&
16 test_must_fail git reset --hard)
19 test_expect_success 'merge reset requires a worktree' '
20 (cd .git &&
21 test_must_fail git reset --merge)
24 test_expect_success 'mixed reset is ok' '
25 (cd .git && git reset)
28 test_expect_success 'soft reset is ok' '
29 (cd .git && git reset --soft)
32 test_expect_success 'hard reset works with GIT_WORK_TREE' '
33 mkdir worktree &&
34 GIT_WORK_TREE=$PWD/worktree GIT_DIR=$PWD/.git git reset --hard &&
35 test_cmp file worktree/file
38 test_expect_success 'setup bare' '
39 git clone --bare . bare.git &&
40 cd bare.git
43 test_expect_success 'hard reset is not allowed in bare' '
44 test_must_fail git reset --hard HEAD^
47 test_expect_success 'merge reset is not allowed in bare' '
48 test_must_fail git reset --merge HEAD^
51 test_expect_success 'mixed reset is not allowed in bare' '
52 test_must_fail git reset --mixed HEAD^
55 test_expect_success 'soft reset is allowed in bare' '
56 git reset --soft HEAD^ &&
57 test "`git show --pretty=format:%s | head -n 1`" = "one"
60 test_done