From: Elijah Newren <newren@gmail.com>
To: git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>
Subject: [PATCHv3 16/16] Replace "unset VAR" with "unset VAR;" in testsuite as per t/README
Date: Sat, 25 Sep 2010 13:07:07 -0600 [thread overview]
Message-ID: <1285441627-28233-17-git-send-email-newren@gmail.com> (raw)
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
next prev parent reply other threads:[~2010-09-25 19:06 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-25 19:06 [PATCHv3 00/16] Add missing &&'s in the testsuite Elijah Newren
2010-09-25 19:06 ` [PATCHv3 01/16] t3020 (ls-files-error-unmatch): remove stray '1' from end of file Elijah Newren
2010-09-25 19:06 ` [PATCHv3 02/16] t4017 (diff-retval): replace manual exit code check with test_expect_code Elijah Newren
2010-09-25 19:06 ` [PATCHv3 03/16] t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing && Elijah Newren
2010-09-25 19:06 ` [PATCHv3 04/16] t4002 (diff-basic): use test_might_fail for commands that might fail Elijah Newren
2010-09-25 19:06 ` [PATCHv3 05/16] t4202 (log): Replace '<git-command> || :' with test_might_fail Elijah Newren
2010-09-25 19:06 ` [PATCHv3 06/16] t3600 (rm): add lots of missing && Elijah Newren
2010-09-25 19:06 ` [PATCHv3 07/16] t4019 (diff-wserror): " Elijah Newren
2010-09-25 19:06 ` [PATCHv3 08/16] t4026 (color): add " Elijah Newren
2010-09-26 3:38 ` Jeff King
2010-09-26 12:39 ` Elijah Newren
2010-09-25 19:07 ` [PATCHv3 09/16] t5602 (clone-remote-exec): " Elijah Newren
2010-09-25 19:07 ` [PATCHv3 10/16] t6016 (rev-list-graph-simplify-history): " Elijah Newren
2010-09-25 19:07 ` [PATCHv3 11/16] t6050 (replace): " Elijah Newren
2010-09-26 5:22 ` Christian Couder
2010-09-25 19:07 ` [PATCHv3 12/16] t7001 (mv): " Elijah Newren
2010-09-25 19:07 ` [PATCHv3 13/16] t7601 (merge-pull-config): " Elijah Newren
2010-09-25 19:07 ` [PATCHv3 14/16] t7800 (difftool): " Elijah Newren
2010-09-25 19:07 ` [PATCHv3 15/16] Add missing &&'s throughout the testsuite Elijah Newren
2010-09-25 19:38 ` Ævar Arnfjörð Bjarmason
2010-09-25 19:48 ` Elijah Newren
2010-09-25 19:07 ` Elijah Newren [this message]
2010-09-25 19:39 ` [PATCHv3 00/16] Add missing &&'s in " Ævar Arnfjörð Bjarmason
2010-09-25 21:07 ` Elijah Newren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1285441627-28233-17-git-send-email-newren@gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).