undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test: commit --amend should honor --no-edit

Browse Source 
A quick test to make sure git doesn't lose the functionality added by
the recent patch "commit: honor --no-edit", plus another test to check
the classical --edit use case (use with "-m").

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Nieder 2011-12-07 08:54:14 -06:00 committed by Junio C Hamano
parent ca1ba20102
commit bc82189998
1 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
t/t7501-commit.sh
View File

@ -94,6 +94,46 @@ test_expect_success 'amend commit' '
EDITOR=./editor git commit --amend
'
test_expect_success 'set up editor' '
cat >editor <<-\EOF &&
#!/bin/sh
sed -e "s/unamended/amended/g" <"$1" >"$1-"
mv "$1-" "$1"
EOF
chmod 755 editor
'
test_expect_success 'amend without launching editor' '
echo unamended >expect &&
git commit --allow-empty -m "unamended" &&
echo needs more bongo >file &&
git add file &&
EDITOR=./editor git commit --no-edit --amend &&
git diff --exit-code HEAD -- file &&
git diff-tree -s --format=%s HEAD >msg &&
test_cmp expect msg
'
test_expect_success '--amend --edit' '
echo amended >expect &&
git commit --allow-empty -m "unamended" &&
echo bongo again >file &&
git add file &&
EDITOR=./editor git commit --edit --amend &&
git diff-tree -s --format=%s HEAD >msg &&
test_cmp expect msg
'
test_expect_success '-m --edit' '
echo amended >expect &&
git commit --allow-empty -m buffer &&
echo bongo bongo >file &&
git add file &&
EDITOR=./editor git commit -m unamended --edit &&
git diff-tree -s --format=%s HEAD >msg &&
test_cmp expect msg
'
test_expect_success '-m and -F do not mix' '
echo enough with the bongos >file &&
test_must_fail git commit -F msg -m amending .