blob: 1eef93c2b292c8ec649f12c826587365e5a0d0e6 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
#!/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 '"keep" reset requires a worktree' '
(cd .git &&
test_must_fail git reset --keep)
'
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 '"keep" reset is not allowed in bare' '
test_must_fail git reset --keep 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
|
