summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-02-09 11:17:26 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-02-09 11:17:26 -0400
commit82bc10d5eafa76ce06b294382e1597d67b06e911 (patch)
tree2438061bd89bad814406a7cded80a0ce1bade91b
parent4a3a80f4321a023e56d63e5fcdb73f075e17e167 (diff)
test: Set git user name and email in case git can't guess values.
-rw-r--r--debian/changelog1
-rw-r--r--doc/bugs/tests_fail_when_there_is_no_global_.gitconfig_for_the_user.mdwn2
-rw-r--r--test.hs3
3 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 072e5fc23..2e5b97c0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ git-annex (0.21) UNRELEASED; urgency=low
* test: Don't rely on chmod -R working.
* unannex: Fix recently introduced bug when attempting to unannex more
than one file at a time.
+ * test: Set git user name and email in case git can't guess values.
-- Joey Hess <joeyh@debian.org> Wed, 09 Feb 2011 00:12:11 -0400
diff --git a/doc/bugs/tests_fail_when_there_is_no_global_.gitconfig_for_the_user.mdwn b/doc/bugs/tests_fail_when_there_is_no_global_.gitconfig_for_the_user.mdwn
index e9dda9916..b90b501e3 100644
--- a/doc/bugs/tests_fail_when_there_is_no_global_.gitconfig_for_the_user.mdwn
+++ b/doc/bugs/tests_fail_when_there_is_no_global_.gitconfig_for_the_user.mdwn
@@ -46,3 +46,5 @@ After doing this, you may fix the identity used for this commit with:
</pre>
I guess it also depends a bit on how git figures out who it is is committing and how the machine in question is configured with hostnames and domain names.
+
+> Fixed that. [[done]] --[[Joey]]
diff --git a/test.hs b/test.hs
index b32a4abb0..309b54176 100644
--- a/test.hs
+++ b/test.hs
@@ -508,6 +508,9 @@ setuprepo dir = do
cleanup dir
ensuretmpdir
Utility.boolSystem "git" ["init", "-q", dir] @? "git init failed"
+ indir dir $ do
+ Utility.boolSystem "git" ["config", "user.name", "Test User"] @? "git config failed"
+ Utility.boolSystem "git" ["config", "user.email", "test@example.com"] @? "git config failed"
return dir
copyrepo :: FilePath -> FilePath -> IO FilePath