Commit 2a070f30 authored by iannucci@chromium.org's avatar iannucci@chromium.org

Fix git tests to work regardless of global gitconfig.

Previously if one or both of these values were unset, the tests would simply fail
because `git config` returns 1.

R=dpranke@chromium.org
BUG=

Review URL: https://chromiumcodereview.appspot.com/18053009

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@208966 0039d316-1c4b-4281-b951-d872f2087c98
parent 0477f8c1
......@@ -48,6 +48,11 @@ setup_gitsvn() {
# There appears to be no way to make git-svn completely shut up, so we
# redirect its output.
git svn -q clone -s $REPO_URL git-svn >/dev/null 2>&1
(
cd git-svn
git config user.name 'TestDood'
git config user.email 'TestDood@example.com'
)
}
# Set up a git-svn checkout of the repo and apply merge commits
......@@ -60,6 +65,8 @@ setup_gitsvn_submodule() {
sed s/^.*:// | xargs`
(
cd git-svn-submodule
git config user.name 'TestDood'
git config user.email 'TestDood@example.com'
echo 'merge-file line 1' > merge-file
git add merge-file; git commit -q -m 'First non-svn commit on master'
git checkout -q refs/remotes/trunk
......@@ -81,6 +88,8 @@ setup_initgit() {
(
cd gitrepo
git init -q
git config user.name 'TestDood'
git config user.email 'TestDood@example.com'
echo "test" > test
git add test
git commit -qam "initial commit"
......@@ -97,6 +106,11 @@ setup_gitgit() {
echo "Setting up test git repo..."
rm -rf git-git
git clone -q $GITREPO_URL git-git
(
cd git-git
git config user.name 'TestDood'
git config user.email 'TestDood@example.com'
)
}
cleanup() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment