mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
test: commit --amend should honor --no-edit
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:
parent
ca1ba20102
commit
bc82189998
|
@ -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 .
|
||||
|
|
Loading…
Reference in a new issue