diff --git a/requirements.txt b/requirements.txt
index facc0ba40c..b718827128 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,6 +7,10 @@ PyYAML>=3.1.0
 Paste
 WebOb>=1.2.3
 paramiko>=1.8.0,<2.0.0
+# Using a local fork of gitpython until at least these changes are in a
+# release.
+# https://github.com/gitpython-developers/GitPython/pull/682
+# https://github.com/gitpython-developers/GitPython/pull/686
 -e git+https://github.com/jeblair/GitPython.git@zuul#egg=GitPython
 python-daemon>=2.0.4,<2.1.0
 extras
diff --git a/tests/fixtures/fake_git.sh b/tests/fixtures/fake_git.sh
index e1734beeb1..5b787b77bc 100755
--- a/tests/fixtures/fake_git.sh
+++ b/tests/fixtures/fake_git.sh
@@ -3,12 +3,12 @@
 echo $*
 case "$1" in
     clone)
-	dest=$3
-	mkdir -p $dest/.git
-	;;
+        dest=$3
+        mkdir -p $dest/.git
+        ;;
     version)
-	echo "git version 1.0.0"
-	exit 0
-	;;
+        echo "git version 1.0.0"
+        exit 0
+        ;;
 esac
 sleep 30