1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-30 13:46:08 +02:00

t7501-commit.sh: explicitly check that -F prevents invoking the editor

The "--signoff" test case in t7500-commit.sh was setting VISUAL while
using -F -, which indeed tested that the editor is not spawned with -F.
However, having it there was confusing, since there was no obvious reason
to the casual reader for it to be there.

This commits removes the setting of VISUAL from the --signoff test, and
adds in t7501-commit.sh a dedicated test case, where the rest of tests for
-F are.

Signed-off-by: Adeodato Simó <dato@net.com.org.es>
Okay-then-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Adeodato Simó 2009-01-09 18:30:05 +01:00 committed by Junio C Hamano
parent df3987717f
commit 7eb5bbdb64
2 changed files with 21 additions and 4 deletions

View File

@ -149,10 +149,7 @@ EOF
test_expect_success '--signoff' '
echo "yet another content *narf*" >> foo &&
echo "zort" | (
test_set_editor "$TEST_DIRECTORY"/t7500/add-content &&
git commit -s -F - foo
) &&
echo "zort" | git commit -s -F - foo &&
git cat-file commit HEAD | sed "1,/^$/d" > output &&
test_cmp expect output
'

View File

@ -127,6 +127,26 @@ test_expect_success \
"showing committed revisions" \
"git rev-list HEAD >current"
cat >editor <<\EOF
#!/bin/sh
sed -e "s/good/bad/g" < "$1" > "$1-"
mv "$1-" "$1"
EOF
chmod 755 editor
cat >msg <<EOF
A good commit message.
EOF
test_expect_success \
'editor not invoked if -F is given' '
echo "moo" >file &&
VISUAL=./editor git commit -a -F msg &&
git show -s --pretty=format:"%s" | grep -q good &&
echo "quack" >file &&
echo "Another good message." | VISUAL=./editor git commit -a -F - &&
git show -s --pretty=format:"%s" | grep -q good
'
# We could just check the head sha1, but checking each commit makes it
# easier to isolate bugs.