[PATCHv2 2/8] t7502: factor out autoident prerequisite

2012-11-14 Thread Jeff King
t7502 checks the behavior of commit when we can and cannot
determine a valid committer ident. Let's move that into
test-lib as a lazy prerequisite so other scripts can use it.

Signed-off-by: Jeff King p...@peff.net
---
 t/t7502-commit.sh | 12 +---
 t/test-lib.sh |  6 ++
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh
index deb187e..1a5cb69 100755
--- a/t/t7502-commit.sh
+++ b/t/t7502-commit.sh
@@ -243,16 +243,6 @@ test_expect_success 'message shows author when it is not 
equal to committer' '
  .git/COMMIT_EDITMSG
 '
 
-test_expect_success 'setup auto-ident prerequisite' '
-   if (sane_unset GIT_COMMITTER_EMAIL 
-   sane_unset GIT_COMMITTER_NAME 
-   git var GIT_COMMITTER_IDENT); then
-   test_set_prereq AUTOIDENT
-   else
-   test_set_prereq NOAUTOIDENT
-   fi
-'
-
 test_expect_success AUTOIDENT 'message shows committer when it is automatic' '
 
echo negative 
@@ -271,7 +261,7 @@ echo editor started  $(pwd)/.git/result
 exit 0
 EOF
 
-test_expect_success NOAUTOIDENT 'do not fire editor when committer is bogus' '
+test_expect_success !AUTOIDENT 'do not fire editor when committer is bogus' '
.git/result
expect 
 
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 489bc80..0334a9e 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -738,6 +738,12 @@ test_lazy_prereq UTF8_NFD_TO_NFC '
esac
 '
 
+test_lazy_prereq AUTOIDENT '
+   sane_unset GIT_AUTHOR_NAME 
+   sane_unset GIT_AUTHOR_EMAIL 
+   git var GIT_AUTHOR_IDENT
+'
+
 # When the tests are run as root, permission tests will report that
 # things are writable when they shouldn't be.
 test -w / || test_set_prereq SANITY
-- 
1.8.0.207.gdf2154c

--
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


Re: [PATCHv2 2/8] t7502: factor out autoident prerequisite

2012-11-14 Thread Jonathan Nieder
Jeff King wrote:

 --- a/t/test-lib.sh
 +++ b/t/test-lib.sh
 @@ -738,6 +738,12 @@ test_lazy_prereq UTF8_NFD_TO_NFC '
   esac
  '
  
 +test_lazy_prereq AUTOIDENT '
 + sane_unset GIT_AUTHOR_NAME 
 + sane_unset GIT_AUTHOR_EMAIL 
 + git var GIT_AUTHOR_IDENT
 +'

Lazy prereq scripts run in a subshell, so this should be safe.  Ack.

Thanks,
Jonathan
--
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