blob: 7e6c9d638433caca632d0d6d6dbdbc8c1bd98ec8 (
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
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
|
#!/bin/sh
test_description='test direct comparison of blobs via git-diff'
TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
run_diff () {
# use full-index to make it easy to match the index line
git diff --full-index "$@" >diff
}
check_index () {
grep "^index $1\\.\\.$2" diff
}
check_mode () {
grep "^old mode $1" diff &&
grep "^new mode $2" diff
}
check_paths () {
grep "^diff --git a/$1 b/$2" diff
}
test_expect_success 'create some blobs' '
echo one >one &&
echo two >two &&
chmod +x two &&
git add . &&
# cover systems where modes are ignored
git update-index --chmod=+x two &&
git commit -m base &&
sha1_one=$(git rev-parse HEAD:one) &&
sha1_two=$(git rev-parse HEAD:two)
'
test_expect_success 'diff by sha1' '
run_diff $sha1_one $sha1_two
'
test_expect_success 'index of sha1 diff' '
check_index $sha1_one $sha1_two
'
test_expect_success 'sha1 diff uses arguments as paths' '
check_paths $sha1_one $sha1_two
'
test_expect_success 'sha1 diff has no mode change' '
! grep mode diff
'
test_expect_success 'diff by tree:path (run)' '
run_diff HEAD:one HEAD:two
'
test_expect_success 'index of tree:path diff' '
check_index $sha1_one $sha1_two
'
test_expect_success 'tree:path diff uses filenames as paths' '
check_paths one two
'
test_expect_success 'tree:path diff shows mode change' '
check_mode 100644 100755
'
test_expect_success 'diff by ranged tree:path' '
run_diff HEAD:one..HEAD:two
'
test_expect_success 'index of ranged tree:path diff' '
check_index $sha1_one $sha1_two
'
test_expect_success 'ranged tree:path diff uses filenames as paths' '
check_paths one two
'
test_expect_success 'ranged tree:path diff shows mode change' '
check_mode 100644 100755
'
test_expect_success 'diff blob against file' '
run_diff HEAD:one two
'
test_expect_success 'index of blob-file diff' '
check_index $sha1_one $sha1_two
'
test_expect_success 'blob-file diff uses filename as paths' '
check_paths one two
'
test_expect_success FILEMODE 'blob-file diff shows mode change' '
check_mode 100644 100755
'
test_expect_success 'blob-file diff prefers filename to sha1' '
run_diff $sha1_one two &&
check_paths two two
'
test_done
|
