git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCHv3 16/16] Replace "unset VAR" with "unset VAR;" in testsuite as per t/README

From
Elijah Newren <newren@gmail.com>
Date
Sep 25, 2010, 19:07 UTC
Message-ID
<1285441627-28233-17-git-send-email-newren@gmail.com>
In-Reply-To
<1285441627-28233-1-git-send-email-newren@gmail.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
---
t/README states that the return value of unset is undefined when the
variable is already unset.  Would it make sense to add a
  portable_unset () {
    unset $* || true
  }
helper function to test-lib, and just use it instead of unset?  That
would allow proper chaining everywhere.
 t/t0001-init.sh   |   28 ++++++++++++++--------------
 t/t7502-commit.sh |    4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index 9d4539f..3c2afb3 100755
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@ -25,7 +25,7 @@ check_config () {
 
 test_expect_success 'plain' '
 	(
-		unset GIT_DIR GIT_WORK_TREE
+		unset GIT_DIR GIT_WORK_TREE;
 		mkdir plain &&
 		cd plain &&
 		git init
@@ -35,7 +35,7 @@ test_expect_success 'plain' '
 
 test_expect_success 'plain with GIT_WORK_TREE' '
 	if (
-		unset GIT_DIR
+		unset GIT_DIR;
 		mkdir plain-wt &&
 		cd plain-wt &&
 		GIT_WORK_TREE=$(pwd) git init
@@ -48,7 +48,7 @@ test_expect_success 'plain with GIT_WORK_TREE' '
 
 test_expect_success 'plain bare' '
 	(
-		unset GIT_DIR GIT_WORK_TREE GIT_CONFIG
+		unset GIT_DIR GIT_WORK_TREE GIT_CONFIG;
 		mkdir plain-bare-1 &&
 		cd plain-bare-1 &&
 		git --bare init
@@ -58,7 +58,7 @@ test_expect_success 'plain bare' '
 
 test_expect_success 'plain bare with GIT_WORK_TREE' '
 	if (
-		unset GIT_DIR GIT_CONFIG
+		unset GIT_DIR GIT_CONFIG;
 		mkdir plain-bare-2 &&
 		cd plain-bare-2 &&
 		GIT_WORK_TREE=$(pwd) git --bare init
@@ -72,7 +72,7 @@ test_expect_success 'plain bare with GIT_WORK_TREE' '
 test_expect_success 'GIT_DIR bare' '
 
 	(
-		unset GIT_CONFIG
+		unset GIT_CONFIG;
 		mkdir git-dir-bare.git &&
 		GIT_DIR=git-dir-bare.git git init
 	) &&
@@ -82,7 +82,7 @@ test_expect_success 'GIT_DIR bare' '
 test_expect_success 'init --bare' '
 
 	(
-		unset GIT_DIR GIT_WORK_TREE GIT_CONFIG
+		unset GIT_DIR GIT_WORK_TREE GIT_CONFIG;
 		mkdir init-bare.git &&
 		cd init-bare.git &&
 		git init --bare
@@ -93,7 +93,7 @@ test_expect_success 'init --bare' '
 test_expect_success 'GIT_DIR non-bare' '
 
 	(
-		unset GIT_CONFIG
+		unset GIT_CONFIG;
 		mkdir non-bare &&
 		cd non-bare &&
 		GIT_DIR=.git git init
@@ -104,7 +104,7 @@ test_expect_success 'GIT_DIR non-bare' '
 test_expect_success 'GIT_DIR & GIT_WORK_TREE (1)' '
 
 	(
-		unset GIT_CONFIG
+		unset GIT_CONFIG;
 		mkdir git-dir-wt-1.git &&
 		GIT_WORK_TREE=$(pwd) GIT_DIR=git-dir-wt-1.git git init
 	) &&
@@ -114,7 +114,7 @@ test_expect_success 'GIT_DIR & GIT_WORK_TREE (1)' '
 test_expect_success 'GIT_DIR & GIT_WORK_TREE (2)' '
 
 	if (
-		unset GIT_CONFIG
+		unset GIT_CONFIG;
 		mkdir git-dir-wt-2.git &&
 		GIT_WORK_TREE=$(pwd) GIT_DIR=git-dir-wt-2.git git --bare init
 	)
@@ -127,7 +127,7 @@ test_expect_success 'GIT_DIR & GIT_WORK_TREE (2)' '
 test_expect_success 'reinit' '
 
 	(
-		unset GIT_CONFIG GIT_WORK_TREE GIT_CONFIG
+		unset GIT_CONFIG GIT_WORK_TREE GIT_CONFIG;
 
 		mkdir again &&
 		cd again &&
@@ -175,8 +175,8 @@ test_expect_success 'init with init.templatedir set' '
 		git config -f "$test_config"  init.templatedir "${HOME}/templatedir-source" &&
 		mkdir templatedir-set &&
 		cd templatedir-set &&
-		unset GIT_CONFIG_NOGLOBAL &&
-		unset GIT_TEMPLATE_DIR &&
+		unset GIT_CONFIG_NOGLOBAL;
+		unset GIT_TEMPLATE_DIR;
 		NO_SET_GIT_TEMPLATE_DIR=t &&
 		export NO_SET_GIT_TEMPLATE_DIR &&
 		git init
@@ -187,7 +187,7 @@ test_expect_success 'init with init.templatedir set' '
 test_expect_success 'init --bare/--shared overrides system/global config' '
 	(
 		test_config="$HOME"/.gitconfig &&
-		unset GIT_CONFIG_NOGLOBAL &&
+		unset GIT_CONFIG_NOGLOBAL;
 		git config -f "$test_config" core.bare false &&
 		git config -f "$test_config" core.sharedRepository 0640 &&
 		mkdir init-bare-shared-override &&
@@ -202,7 +202,7 @@ test_expect_success 'init --bare/--shared overrides system/global config' '
 test_expect_success 'init honors global core.sharedRepository' '
 	(
 		test_config="$HOME"/.gitconfig &&
-		unset GIT_CONFIG_NOGLOBAL &&
+		unset GIT_CONFIG_NOGLOBAL;
 		git config -f "$test_config" core.sharedRepository 0666 &&
 		mkdir shared-honor-global &&
 		cd shared-honor-global &&
diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh
index b6b9802..129ac15 100755
--- a/t/t7502-commit.sh
+++ b/t/t7502-commit.sh
@@ -252,8 +252,8 @@ test_expect_success 'committer is automatic' '
 
 	echo >>negative &&
 	(
-		unset GIT_COMMITTER_EMAIL
-		unset GIT_COMMITTER_NAME
+		unset GIT_COMMITTER_EMAIL;
+		unset GIT_COMMITTER_NAME;
 		# must fail because there is no change
 		test_must_fail git commit -e -m "sample"
 	) &&

-- 
1.7.3.95.g14291
Previous: Elijah NewrenNext: Ævar Arnfjörð Bjarmason
Message 22 of 24 in “[PATCHv3 00/16] Add missing &&'s in the testsuite”
  1. Elijah NewrenSep 25, 2010
  2. 01/16 t3020 (ls-files-error-unmatch): remove stray '1' from end of fileElijah Newren, Sep 25, 2010
  3. 02/16 t4017 (diff-retval): replace manual exit code check with test_expect_codeElijah Newren, Sep 25, 2010
  4. 03/16 t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing &&Elijah Newren, Sep 25, 2010
  5. 04/16 t4002 (diff-basic): use test_might_fail for commands that might failElijah Newren, Sep 25, 2010
  6. 05/16 t4202 (log): Replace '<git-command> || :' with test_might_failElijah Newren, Sep 25, 2010
  7. 06/16 t3600 (rm): add lots of missing &&Elijah Newren, Sep 25, 2010
  8. 07/16 t4019 (diff-wserror): add lots of missing &&Elijah Newren, Sep 25, 2010
  9. 08/16 t4026 (color): add missing &&Elijah Newren, Sep 25, 2010
  10. Jeff KingSep 26, 2010
  11. Elijah NewrenSep 26, 2010
  12. 09/16 t5602 (clone-remote-exec): add missing &&Elijah Newren, Sep 25, 2010
  13. 10/16 t6016 (rev-list-graph-simplify-history): add missing &&Elijah Newren, Sep 25, 2010
  14. 11/16 t6050 (replace): add missing &&Elijah Newren, Sep 25, 2010
  15. Christian CouderSep 26, 2010
  16. 12/16 t7001 (mv): add missing &&Elijah Newren, Sep 25, 2010
  17. 13/16 t7601 (merge-pull-config): add missing &&Elijah Newren, Sep 25, 2010
  18. 14/16 t7800 (difftool): add missing &&Elijah Newren, Sep 25, 2010
  19. 15/16 Add missing &&'s throughout the testsuiteElijah Newren, Sep 25, 2010
  20. Ævar Arnfjörð BjarmasonSep 25, 2010
  21. Elijah NewrenSep 25, 2010
  22. 16/16 Replace "unset VAR" with "unset VAR;" in testsuite as per t/READMEElijah Newren, Sep 25, 2010
  23. Ævar Arnfjörð BjarmasonSep 25, 2010
  24. Elijah NewrenSep 25, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.