From: Brandon Casey <casey@nrlssc.navy.mil>
Date: Tue, 22 Jul 2008 21:21:10 +0000 (-0500)
Subject: t7502-commit.sh: rearrange test to make more portable
X-Git-Tag: v1.6.0-rc1~68
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=09b78bc1fc4e525bc68fa0ce76521457717fe675;p=git.git

t7502-commit.sh: rearrange test to make more portable

Some shells have problems with one-shot environment variable export
and function calls. The sequence is rearranged to avoid the one-shot
and to allow the test script to be linked together with '&&'.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh
index c25eff9e4..4f2682ea8 100755
--- a/t/t7502-commit.sh
+++ b/t/t7502-commit.sh
@@ -228,10 +228,12 @@ EOF
 
 test_expect_success 'a SIGTERM should break locks' '
 	echo >>negative &&
-	"$SHELL_PATH" -c '\''
+	! "$SHELL_PATH" -c '\''
 	  echo kill -TERM $$ >> .git/FAKE_EDITOR
-	  GIT_EDITOR=.git/FAKE_EDITOR exec git commit -a'\'' && exit 1  # should fail
-	! test -f .git/index.lock
+	  GIT_EDITOR=.git/FAKE_EDITOR
+	  export GIT_EDITOR
+	  exec git commit -a'\'' &&
+	test ! -f .git/index.lock
 '
 
 rm -f .git/MERGE_MSG .git/COMMIT_EDITMSG