[PATCH v2] t7501-commit.sh: explicitly check that -F prevents invoking the editor
- From
Adeodato Simó <dato@net.com.org.es>
- Date
- Jan 9, 2009, 17:30 UTC
- Message-ID
- <1231522205-10510-1-git-send-email-dato@net.com.org.es>
- In-Reply-To
- <alpine.DEB.1.00.0812301250210.30769@pacific.mpi-cbg.de>
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> --- * Johannes Schindelin [Tue, 30 Dec 2008 13:04:46 +0100]:
> Hmm. Obviously, I failed to document properly why I tested the editor, > but I think it makes sense to assume that -F still triggered an > interactive editor at some stage in the development of builtin commit.
> I do not have anything against separating that issue into another test > case, but I am strongly opposed to simply removing it.
Ok, I've moved it to a separate test case, please review to see if you approve of it.
Thanks,
t/t7500-commit.sh | 5 +---- t/t7501-commit.sh | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/t/t7500-commit.sh b/t/t7500-commit.sh index 6e18a96..5998baf 100755 --- a/t/t7500-commit.sh +++ b/t/t7500-commit.sh @@ -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 ' diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh index 63bfc6d..b4e2b4d 100755 --- a/t/t7501-commit.sh +++ b/t/t7501-commit.sh @@ -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.
-- 1.6.1.134.g55c35