Some shells do not like "export var=val", and the right way to write
these is to do an usual assignment and then export just variable names.
Also corrects a typo in the tests added by 94859732 and noticed by
Brandon Casey (gmane 110412):
test_expect_success 'refusing to edit in refs/heads/' '
(MSG=1 GIT_NOTES_REF=refs/heads/bogus &&
export MSG= GIT_NOTES_REF=refs/heads/bogus &&
test_must_fail git notes edit)
'
test_expect_success 'refusing to edit in refs/remotes/' '
(MSG=1 GIT_NOTES_REF=refs/remotes/bogus &&
export MSG= GIT_NOTES_REF=refs/heads/bogus &&
test_must_fail git notes edit)
'
Notice the 'export' lines. Comparing it to Thomas's v2 5/5 patch, it
looks like the first line which sets the variables is correct and
the export line should just be 'export MSG GIT_NOTES_REF' in both
tests.
Signed-off-by: Jay Soffian <jaysoffian@xxxxxxxxx>
---
This time with a better (I hope...) commit message to clarify
that we are fixing a typo and not introducing one.
t/t3301-notes.sh | 4 ++--
t/t3302-notes-index-expensive.sh | 4 ++--
t/t9301-fast-export.sh | 4 ++--
t/test-lib.sh | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh
index 2321316..18c4eb6 100755
--- a/t/t3301-notes.sh
+++ b/t/t3301-notes.sh
@@ -39,13 +39,13 @@ test_expect_success 'need valid notes ref' '
test_expect_success 'refusing to edit in refs/heads/' '
(MSG=1 GIT_NOTES_REF=refs/heads/bogus &&
- export MSG= GIT_NOTES_REF=refs/heads/bogus &&
+ export MSG GIT_NOTES_REF &&
test_must_fail git notes edit)
'
test_expect_success 'refusing to edit in refs/remotes/' '
(MSG=1 GIT_NOTES_REF=refs/remotes/bogus &&
- export MSG= GIT_NOTES_REF=refs/heads/bogus &&
+ export MSG GIT_NOTES_REF &&
test_must_fail git notes edit)
'
diff --git a/t/t3302-notes-index-expensive.sh b/t/t3302-notes-index-expensive.sh
index 00d27bf..0ef3e95 100755
--- a/t/t3302-notes-index-expensive.sh
+++ b/t/t3302-notes-index-expensive.sh
@@ -29,7 +29,7 @@ create_repo () {
done &&
git update-ref refs/heads/master $commit &&
{
- export GIT_INDEX_FILE=.git/temp;
+ GIT_INDEX_FILE=.git/temp; export GIT_INDEX_FILE;
git rev-list HEAD | cat -n | sed "s/^[ ][ ]*/ /g" |
while read nr sha1; do
blob=$(echo note $nr | git hash-object -w --stdin) &&
@@ -63,7 +63,7 @@ cat > time_notes << \EOF
while [ $i -lt $2 ]; do
case $1 in
no-notes)
- export GIT_NOTES_REF=non-existing
+ GIT_NOTES_REF=non-existing; export GIT_NOTES_REF
;;
notes)
unset GIT_NOTES_REF
diff --git a/t/t9301-fast-export.sh b/t/t9301-fast-export.sh
index 9985721..86c3760 100755
--- a/t/t9301-fast-export.sh
+++ b/t/t9301-fast-export.sh
@@ -185,8 +185,8 @@ test_expect_success 'submodule fast-export | fast-import' '
'
-export GIT_AUTHOR_NAME='A U Thor'
-export GIT_COMMITTER_NAME='C O Mitter'
+GIT_AUTHOR_NAME='A U Thor'; export GIT_AUTHOR_NAME
+GIT_COMMITTER_NAME='C O Mitter'; export GIT_COMMITTER_NAME
test_expect_success 'setup copies' '
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 2021446..7a847ec 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -98,7 +98,7 @@ do
-i|--i|--im|--imm|--imme|--immed|--immedi|--immedia|--immediat|--immediate)
immediate=t; shift ;;
-l|--l|--lo|--lon|--long|--long-|--long-t|--long-te|--long-tes|--long-test|--long-tests)
- export GIT_TEST_LONG=t; shift ;;
+ GIT_TEST_LONG=t; export GIT_TEST_LONG; shift ;;
-h|--h|--he|--hel|--help)
help=t; shift ;;
-v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose)
--
1.6.2.rc1.218.g1b4fab
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
