]> git.ipfire.org Git - thirdparty/git.git/blame - t/t7507-commit-verbose.sh
test framework: further deprecate test_i18ngrep
[thirdparty/git.git] / t / t7507-commit-verbose.sh
CommitLineData
0b38227f
JK
1#!/bin/sh
2
3test_description='verbose commit template'
e77b3da6
ÆAB
4
5TEST_PASSES_SANITIZE_LEAK=true
0b38227f
JK
6. ./test-lib.sh
7
de45dbb8
PB
8write_script "check-for-diff" <<\EOF &&
9grep '^diff --git' "$1" >out
10exit 0
0b38227f 11EOF
0b38227f
JK
12test_set_editor "$PWD/check-for-diff"
13
14cat >message <<'EOF'
15subject
16
17body
18EOF
19
20test_expect_success 'setup' '
21 echo content >file &&
22 git add file &&
23 git commit -F message
24'
25
1324fb6f 26test_expect_success 'initial commit shows verbose diff' '
de45dbb8
PB
27 git commit --amend -v &&
28 test_line_count = 1 out
0b38227f
JK
29'
30
31test_expect_success 'second commit' '
32 echo content modified >file &&
33 git add file &&
34 git commit -F message
35'
36
37check_message() {
38 git log -1 --pretty=format:%s%n%n%b >actual &&
39 test_cmp "$1" actual
40}
41
42test_expect_success 'verbose diff is stripped out' '
43 git commit --amend -v &&
de45dbb8
PB
44 check_message message &&
45 test_line_count = 1 out
0b38227f
JK
46'
47
48test_expect_success 'verbose diff is stripped out (mnemonicprefix)' '
49 git config diff.mnemonicprefix true &&
50 git commit --amend -v &&
de45dbb8
PB
51 check_message message &&
52 test_line_count = 1 out
0b38227f
JK
53'
54
55cat >diff <<'EOF'
56This is an example commit message that contains a diff.
57
58diff --git c/file i/file
59new file mode 100644
60index 0000000..f95c11d
61--- /dev/null
62+++ i/file
63@@ -0,0 +1 @@
64+this is some content
65EOF
66
67test_expect_success 'diff in message is retained without -v' '
68 git commit --amend -F diff &&
69 check_message diff
70'
71
1a72cfd7 72test_expect_success 'diff in message is retained with -v' '
0b38227f
JK
73 git commit --amend -F diff -v &&
74 check_message diff
75'
76
1a72cfd7
JL
77test_expect_success 'submodule log is stripped out too with -v' '
78 git config diff.submodule log &&
0d3beb71 79 test_config_global protocol.file.allow always &&
1a72cfd7
JL
80 git submodule add ./. sub &&
81 git commit -m "sub added" &&
82 (
83 cd sub &&
84 echo "more" >>file &&
85 git commit -a -m "submodule commit"
86 ) &&
87 (
88 GIT_EDITOR=cat &&
89 export GIT_EDITOR &&
90 test_must_fail git commit -a -v 2>err
91 ) &&
92 test_i18ngrep "Aborting commit due to empty commit message." err
93'
94
95test_expect_success 'verbose diff is stripped out with set core.commentChar' '
96 (
97 GIT_EDITOR=cat &&
98 export GIT_EDITOR &&
99 test_must_fail git -c core.commentchar=";" commit -a -v 2>err
100 ) &&
101 test_i18ngrep "Aborting commit due to empty commit message." err
102'
103
98baeb79
PB
104test_expect_success 'status does not verbose without --verbose' '
105 git status >actual &&
106 ! grep "^diff --git" actual
107'
108
aaab8420
PB
109test_expect_success 'setup -v -v' '
110 echo dirty >file
111'
112
113for i in true 1
114do
115 test_expect_success "commit.verbose=$i and --verbose omitted" "
116 git -c commit.verbose=$i commit --amend &&
117 test_line_count = 1 out
118 "
119done
120
121for i in false -2 -1 0
122do
123 test_expect_success "commit.verbose=$i and --verbose omitted" "
124 git -c commit.verbose=$i commit --amend &&
125 test_line_count = 0 out
126 "
127done
128
129for i in 2 3
130do
131 test_expect_success "commit.verbose=$i and --verbose omitted" "
132 git -c commit.verbose=$i commit --amend &&
133 test_line_count = 2 out
134 "
135done
136
137for i in true false -2 -1 0 1 2 3
138do
139 test_expect_success "commit.verbose=$i and --verbose" "
140 git -c commit.verbose=$i commit --amend --verbose &&
141 test_line_count = 1 out
142 "
143
144 test_expect_success "commit.verbose=$i and --no-verbose" "
145 git -c commit.verbose=$i commit --amend --no-verbose &&
146 test_line_count = 0 out
147 "
148
149 test_expect_success "commit.verbose=$i and -v -v" "
150 git -c commit.verbose=$i commit --amend -v -v &&
151 test_line_count = 2 out
152 "
153done
154
155test_expect_success "status ignores commit.verbose=true" '
156 git -c commit.verbose=true status >actual &&
157 ! grep "^diff --git actual"
158'
159
0b38227f 160test_done