t1005: reindent
Just to update the style of this ancient test script to match our house style. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Nov 1, 2013 at 14:55 UTC
76da5b1d22a7f0e3e34a780df91717e6269e84b4
2 files changed
+89
-89
t/lib-read-tree.sh
+26
-26
@@ -5,39 +5,39 @@
5
# write the index and that together with -u it doesn't touch the work tree.
6
#
7
read_tree_must_succeed () {
8
- git ls-files -s >pre-dry-run &&
9
- git read-tree -n "$@" &&
10
- git ls-files -s >post-dry-run &&
11
- test_cmp pre-dry-run post-dry-run &&
12
- git read-tree "$@"
8
+ git ls-files -s >pre-dry-run &&
9
+ git read-tree -n "$@" &&
10
+ git ls-files -s >post-dry-run &&
11
+ test_cmp pre-dry-run post-dry-run &&
12
+ git read-tree "$@"
13
}
14
15
read_tree_must_fail () {
16
- git ls-files -s >pre-dry-run &&
17
- test_must_fail git read-tree -n "$@" &&
18
- git ls-files -s >post-dry-run &&
19
- test_cmp pre-dry-run post-dry-run &&
20
- test_must_fail git read-tree "$@"
16
+ git ls-files -s >pre-dry-run &&
17
+ test_must_fail git read-tree -n "$@" &&
18
+ git ls-files -s >post-dry-run &&
19
+ test_cmp pre-dry-run post-dry-run &&
20
+ test_must_fail git read-tree "$@"
21
}
22
23
read_tree_u_must_succeed () {
24
- git ls-files -s >pre-dry-run &&
25
- git diff-files -p >pre-dry-run-wt &&
26
- git read-tree -n "$@" &&
27
- git ls-files -s >post-dry-run &&
28
- git diff-files -p >post-dry-run-wt &&
29
- test_cmp pre-dry-run post-dry-run &&
30
- test_cmp pre-dry-run-wt post-dry-run-wt &&
31
- git read-tree "$@"
24
+ git ls-files -s >pre-dry-run &&
25
+ git diff-files -p >pre-dry-run-wt &&
26
+ git read-tree -n "$@" &&
27
+ git ls-files -s >post-dry-run &&
28
+ git diff-files -p >post-dry-run-wt &&
29
+ test_cmp pre-dry-run post-dry-run &&
30
+ test_cmp pre-dry-run-wt post-dry-run-wt &&
31
+ git read-tree "$@"
32
}
33
34
read_tree_u_must_fail () {
35
- git ls-files -s >pre-dry-run &&
36
- git diff-files -p >pre-dry-run-wt &&
37
- test_must_fail git read-tree -n "$@" &&
38
- git ls-files -s >post-dry-run &&
39
- git diff-files -p >post-dry-run-wt &&
40
- test_cmp pre-dry-run post-dry-run &&
41
- test_cmp pre-dry-run-wt post-dry-run-wt &&
42
- test_must_fail git read-tree "$@"
35
+ git ls-files -s >pre-dry-run &&
36
+ git diff-files -p >pre-dry-run-wt &&
37
+ test_must_fail git read-tree -n "$@" &&
38
+ git ls-files -s >post-dry-run &&
39
+ git diff-files -p >post-dry-run-wt &&
40
+ test_cmp pre-dry-run post-dry-run &&
41
+ test_cmp pre-dry-run-wt post-dry-run-wt &&
42
+ test_must_fail git read-tree "$@"
43
}
t/t1005-read-tree-reset.sh
+63
-63
@@ -8,84 +8,84 @@ test_description='read-tree -u --reset'
8
# two-tree test
9
10
test_expect_success 'setup' '
11
- git init &&
12
- mkdir df &&
13
- echo content >df/file &&
14
- git add df/file &&
15
- git commit -m one &&
16
- git ls-files >expect &&
17
- rm -rf df &&
18
- echo content >df &&
19
- git add df &&
20
- echo content >new &&
21
- git add new &&
22
- git commit -m two
11
+ git init &&
12
+ mkdir df &&
13
+ echo content >df/file &&
14
+ git add df/file &&
15
+ git commit -m one &&
16
+ git ls-files >expect &&
17
+ rm -rf df &&
18
+ echo content >df &&
19
+ git add df &&
20
+ echo content >new &&
21
+ git add new &&
22
+ git commit -m two
23
'
24
25
test_expect_success 'reset should work' '
26
- read_tree_u_must_succeed -u --reset HEAD^ &&
27
- git ls-files >actual &&
28
- test_cmp expect actual
26
+ read_tree_u_must_succeed -u --reset HEAD^ &&
27
+ git ls-files >actual &&
28
+ test_cmp expect actual
29
'
30
31
test_expect_success 'reset should remove remnants from a failed merge' '
32
- read_tree_u_must_succeed --reset -u HEAD &&
33
- git ls-files -s >expect &&
34
- sha1=$(git rev-parse :new) &&
35
- (
36
- echo "100644 $sha1 1 old"
37
- echo "100644 $sha1 3 old"
38
- ) | git update-index --index-info &&
39
- >old &&
40
- git ls-files -s &&
41
- read_tree_u_must_succeed --reset -u HEAD &&
42
- git ls-files -s >actual &&
43
- ! test -f old
32
+ read_tree_u_must_succeed --reset -u HEAD &&
33
+ git ls-files -s >expect &&
34
+ sha1=$(git rev-parse :new) &&
35
+ (
36
+ echo "100644 $sha1 1 old"
37
+ echo "100644 $sha1 3 old"
38
+ ) | git update-index --index-info &&
39
+ >old &&
40
+ git ls-files -s &&
41
+ read_tree_u_must_succeed --reset -u HEAD &&
42
+ git ls-files -s >actual &&
43
+ ! test -f old
44
'
45
46
test_expect_success 'Porcelain reset should remove remnants too' '
47
- read_tree_u_must_succeed --reset -u HEAD &&
48
- git ls-files -s >expect &&
49
- sha1=$(git rev-parse :new) &&
50
- (
51
- echo "100644 $sha1 1 old"
52
- echo "100644 $sha1 3 old"
53
- ) | git update-index --index-info &&
54
- >old &&
55
- git ls-files -s &&
56
- git reset --hard &&
57
- git ls-files -s >actual &&
58
- ! test -f old
47
+ read_tree_u_must_succeed --reset -u HEAD &&
48
+ git ls-files -s >expect &&
49
+ sha1=$(git rev-parse :new) &&
50
+ (
51
+ echo "100644 $sha1 1 old"
52
+ echo "100644 $sha1 3 old"
53
+ ) | git update-index --index-info &&
54
+ >old &&
55
+ git ls-files -s &&
56
+ git reset --hard &&
57
+ git ls-files -s >actual &&
58
+ ! test -f old
59
'
60
61
test_expect_success 'Porcelain checkout -f should remove remnants too' '
62
- read_tree_u_must_succeed --reset -u HEAD &&
63
- git ls-files -s >expect &&
64
- sha1=$(git rev-parse :new) &&
65
- (
66
- echo "100644 $sha1 1 old"
67
- echo "100644 $sha1 3 old"
68
- ) | git update-index --index-info &&
69
- >old &&
70
- git ls-files -s &&
71
- git checkout -f &&
72
- git ls-files -s >actual &&
73
- ! test -f old
62
+ read_tree_u_must_succeed --reset -u HEAD &&
63
+ git ls-files -s >expect &&
64
+ sha1=$(git rev-parse :new) &&
65
+ (
66
+ echo "100644 $sha1 1 old"
67
+ echo "100644 $sha1 3 old"
68
+ ) | git update-index --index-info &&
69
+ >old &&
70
+ git ls-files -s &&
71
+ git checkout -f &&
72
+ git ls-files -s >actual &&
73
+ ! test -f old
74
'
75
76
test_expect_success 'Porcelain checkout -f HEAD should remove remnants too' '
77
- read_tree_u_must_succeed --reset -u HEAD &&
78
- git ls-files -s >expect &&
79
- sha1=$(git rev-parse :new) &&
80
- (
81
- echo "100644 $sha1 1 old"
82
- echo "100644 $sha1 3 old"
83
- ) | git update-index --index-info &&
84
- >old &&
85
- git ls-files -s &&
86
- git checkout -f HEAD &&
87
- git ls-files -s >actual &&
88
- ! test -f old
77
+ read_tree_u_must_succeed --reset -u HEAD &&
78
+ git ls-files -s >expect &&
79
+ sha1=$(git rev-parse :new) &&
80
+ (
81
+ echo "100644 $sha1 1 old"
82
+ echo "100644 $sha1 3 old"
83
+ ) | git update-index --index-info &&
84
+ >old &&
85
+ git ls-files -s &&
86
+ git checkout -f HEAD &&
87
+ git ls-files -s >actual &&
88
+ ! test -f old
89
'
90
91
test_done