t/t7507-commit-verbose.sh was using a global test_set_editor call to
build its environment.
Improve robustness against global state changes by having only tests
which intend to use the $EDITOR to check for presence of a diff in the
editor set up the test-editor to use check-for-diff rather than relying
upon the editor set once at script start.
Besides being in line with current practices, it also allows the tests
which set GIT_EDITOR=cat manually to avoid using a subshell and simplify
their logic.
Signed-off-by: Caleb Thompson <ca...@calebthompson.io>
---
t/t7507-commit-verbose.sh | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/t/t7507-commit-verbose.sh b/t/t7507-commit-verbose.sh
index db09107..35a4d06 100755
--- a/t/t7507-commit-verbose.sh
+++ b/t/t7507-commit-verbose.sh
@@ -6,7 +6,6 @@ test_description='verbose commit template'
write_script check-for-diff <<-'EOF'
exec grep '^diff --git' "$1"
EOF
-test_set_editor "$PWD/check-for-diff"
cat >message <<'EOF'
subject
@@ -21,6 +20,7 @@ test_expect_success 'setup' '
'
test_expect_success 'initial commit shows verbose diff' '
+ test_set_editor "$PWD/check-for-diff" &&
git commit --amend -v
'
@@ -36,11 +36,13 @@ check_message() {
}
test_expect_success 'verbose diff is stripped out' '
+ test_set_editor "$PWD/check-for-diff" &&
git commit --amend -v &&
check_message message
'
test_expect_success 'verbose diff is stripped out (mnemonicprefix)' '
+ test_set_editor "$PWD/check-for-diff" &&
test_config diff.mnemonicprefix true &&
git commit --amend -v &&
check_message message
@@ -77,20 +79,14 @@ test_expect_success 'submodule log is stripped out too with
-v' '
echo "more" >>file &&
git commit -a -m "submodule commit"
) &&
- (
- GIT_EDITOR=cat &&
- export GIT_EDITOR &&
- test_must_fail git commit -a -v 2>err
- ) &&
+ test_set_editor cat &&
+ test_must_fail git commit -a -v 2>err &&
test_i18ngrep "Aborting commit due to empty commit message." err
'
test_expect_success 'verbose diff is stripped out with set core.commentChar' '
- (
- GIT_EDITOR=cat &&
- export GIT_EDITOR &&
- test_must_fail git -c core.commentchar=";" commit -a -v 2>err
- ) &&
+ test_set_editor cat &&
+ test_must_fail git -c core.commentchar=";" commit -a -v 2>err &&
test_i18ngrep "Aborting commit due to empty commit message." err
'
--
2.0.0
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
