x
/
turbo-hipster
Code Issues Proposed changes

Make git more verbose for debugging 

Change-Id: I05ebe9e58bacc324dbe4430ef9627dd81c14f023
This commit is contained in:
Joshua Hesketh 2015-06-05 12:37:44 +10:00
parent bad0b1fda2
commit 326fd8a230
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
turbo_hipster/lib/gerrit-git-prep.sh
View File

@ -50,19 +50,19 @@ then
rm -fr .[^.]* *
if [ -d /opt/git/$ZUUL_PROJECT/.git ]
then
git clone file:///opt/git/$ZUUL_PROJECT .
git clone -vvvvvv file:///opt/git/$ZUUL_PROJECT .
else
git clone $GIT_ORIGIN/$ZUUL_PROJECT .
git clone -vvvvvv $GIT_ORIGIN/$ZUUL_PROJECT .
fi
fi
git remote set-url origin $GIT_ORIGIN/$ZUUL_PROJECT
git remote -vvvvvv set-url origin $GIT_ORIGIN/$ZUUL_PROJECT
# attempt to work around bugs 925790 and 1229352
if ! git remote update
if ! git remote -vvvvvv update
then
echo "The remote update failed, so garbage collecting before trying again."
git gc
git remote update
git remote -vvvvvv update
fi
git reset --hard
@ -73,12 +73,12 @@ fi
if echo "$ZUUL_REF" | grep -q ^refs/tags/
then
git fetch --tags $ZUUL_URL/$ZUUL_PROJECT
git fetch -vvvvvv --tags $ZUUL_URL/$ZUUL_PROJECT
git checkout $ZUUL_REF
git reset --hard $ZUUL_REF
elif [ -z "$ZUUL_NEWREV" ]
then
git fetch $ZUUL_URL/$ZUUL_PROJECT $ZUUL_REF
git fetch -vvvvvv $ZUUL_URL/$ZUUL_PROJECT $ZUUL_REF
git checkout FETCH_HEAD
git reset --hard FETCH_HEAD
else

1
turbo_hipster/lib/models.py
View File

@ -320,6 +320,7 @@ class ShellTask(Task):
return_code = 1
while return_code != 0:
tries += 1
env.update({'GIT_CURL_VERBOSE': 1, 'GIT_TRACE': 1})
return_code = utils.execute_to_log(cmd, self.git_prep_log,
env=env, cwd=local_path)
if tries == 2: