3 test_description
='git commit porcelain-ish'
7 test_expect_success
'the basics' '
9 echo doing partial >"commit is" &&
11 echo very much encouraged but we should >not/forbid &&
12 git add "commit is" not &&
13 echo update added "commit is" file >"commit is" &&
14 echo also update another >not/forbid &&
16 git commit -a -m "initial with -a" &&
18 git cat-file blob HEAD:"commit is" >current.1 &&
19 git cat-file blob HEAD:not/forbid >current.2 &&
21 cmp current.1 "commit is" &&
22 cmp current.2 not/forbid
26 test_expect_success
'partial' '
28 echo another >"commit is" &&
29 echo another >not/forbid &&
31 git commit -m "partial commit to handle a file" "commit is" &&
33 changed=$(git diff-tree --name-only HEAD^ HEAD) &&
34 test "$changed" = "commit is"
38 test_expect_success
'partial modification in a subdirecotry' '
41 git commit -m "partial commit to subdirectory" not &&
43 changed=$(git diff-tree -r --name-only HEAD^ HEAD) &&
44 test "$changed" = "not/forbid"
48 test_expect_success
'partial removal' '
51 git commit -m "partial commit to remove not/forbid" not &&
53 changed=$(git diff-tree -r --name-only HEAD^ HEAD) &&
54 test "$changed" = "not/forbid" &&
55 remain=$(git ls-tree -r --name-only HEAD) &&
56 test "$remain" = "commit is"
60 test_expect_success
'sign off' '
64 git commit -s -m "thank you" &&
65 actual=$(git cat-file commit HEAD | sed -ne "s/Signed-off-by: //p") &&
66 expected=$(git var GIT_COMMITTER_IDENT | sed -e "s/>.*/>/") &&
67 test "z$actual" = "z$expected"
71 test_expect_success
'multiple -m' '
75 git commit -m "one" -m "two" -m "three" &&
76 actual=$(git cat-file commit HEAD | sed -e "1,/^\$/d") &&
77 expected=$(echo one; echo; echo two; echo; echo three) &&
78 test "z$actual" = "z$expected"
82 test_expect_success
'verbose' '
84 echo minus >negative &&
86 git status -v | sed -ne "/^diff --git /p" >actual &&
87 echo "diff --git a/negative b/negative" >expect &&
88 test_cmp expect actual
92 test_expect_success
'cleanup commit messages (verbatim,-t)' '
95 { echo;echo "# text";echo; } >expect &&
96 git commit --cleanup=verbatim -t expect -a &&
97 git cat-file -p HEAD |sed -e "1,/^\$/d" |head -n 3 >actual &&
98 test_cmp expect actual
102 test_expect_success
'cleanup commit messages (verbatim,-F)' '
105 git commit --cleanup=verbatim -F expect -a &&
106 git cat-file -p HEAD |sed -e "1,/^\$/d">actual &&
107 test_cmp expect actual
111 test_expect_success
'cleanup commit messages (verbatim,-m)' '
114 git commit --cleanup=verbatim -m "$(cat expect)" -a &&
115 git cat-file -p HEAD |sed -e "1,/^\$/d">actual &&
116 test_cmp expect actual
120 test_expect_success
'cleanup commit messages (whitespace,-F)' '
123 { echo;echo "# text";echo; } >text &&
124 echo "# text" >expect &&
125 git commit --cleanup=whitespace -F text -a &&
126 git cat-file -p HEAD |sed -e "1,/^\$/d">actual &&
127 test_cmp expect actual
131 test_expect_success
'cleanup commit messages (strip,-F)' '
134 { echo;echo "# text";echo sample;echo; } >text &&
135 echo sample >expect &&
136 git commit --cleanup=strip -F text -a &&
137 git cat-file -p HEAD |sed -e "1,/^\$/d">actual &&
138 test_cmp expect actual
144 # Please enter the commit message for your changes.
145 # To abort the commit, use an empty commit message.
146 # (Comment lines starting with '#' will not be included)" >expect
148 test_expect_success
'cleanup commit messages (strip,-F,-e)' '
151 { echo;echo sample;echo; } >text &&
152 git commit -e -F text -a &&
153 head -n 5 .git/COMMIT_EDITMSG >actual &&
154 test_cmp expect actual
159 # Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
162 test_expect_success
'author different from committer' '
165 git commit -e -m "sample"
166 head -n 8 .git/COMMIT_EDITMSG >actual &&
167 test_cmp expect actual
171 sed '$d' < expect.tmp
> expect
176 test_expect_success
'committer is automatic' '
180 unset GIT_COMMITTER_EMAIL
181 unset GIT_COMMITTER_NAME
182 # must fail because there is no change
183 test_must_fail git commit -e -m "sample"
185 head -n 9 .git/COMMIT_EDITMSG | \
186 sed "s/^# Committer: .*/# Committer:/" >actual &&
187 test_cmp expect actual
191 cat >> .git
/FAKE_EDITOR
<< EOF
193 echo editor started > "$pwd/.git/result"
196 chmod +x .git
/FAKE_EDITOR
198 test_expect_success
'do not fire editor in the presence of conflicts' '
203 git commit -m "add g" &&
208 git commit -m "modify g and add h" &&
209 git checkout second &&
212 git commit -m second &&
213 # Must fail due to conflict
214 test_must_fail git cherry-pick -n master &&
215 echo "editor not started" >.git/result &&
217 GIT_EDITOR="$(pwd)/.git/FAKE_EDITOR" &&
219 test_must_fail git commit
221 test "$(cat .git/result)" = "editor not started"
225 cat >.git
/FAKE_EDITOR
<<EOF
227 # kill -TERM command added below.
230 test_expect_success
'a SIGTERM should break locks' '
232 ! "$SHELL_PATH" -c '\''
233 echo kill -TERM $$ >> .git/FAKE_EDITOR
234 GIT_EDITOR=.git/FAKE_EDITOR
236 exec git commit -a'\'' &&
237 test ! -f .git/index.lock
240 rm -f .git
/MERGE_MSG .git
/COMMIT_EDITMSG
243 test_expect_success
'Hand committing of a redundant merge removes dups' '
245 git rev-parse second master >expect &&
246 test_must_fail git merge second master &&
247 git checkout master g &&
248 EDITOR=: git commit -a &&
249 git cat-file commit HEAD | sed -n -e "s/^parent //p" -e "/^$/q" >actual &&
250 test_cmp expect actual