summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2014-11-14 15:20:12 +0100
committerSebastian Thiel <byronimo@gmail.com>2014-11-14 15:20:12 +0100
commit5c6a8d84995b2bdcaf78cce1fe3d68ba50f606ad (patch)
treeedd45f353903ec8adeeaf468deeba820d37f9040
parent6620d9f63598854ab48c9467a2bdfdf74283b4e7 (diff)
parent9d300e20f30c057bbacffbb9a8aa06e6da5e2691 (diff)
downloadgitpython-5c6a8d84995b2bdcaf78cce1fe3d68ba50f606ad.tar.gz
Merge pull request #192 from maxyz/master
test_fetch_info error, FETCH_HEAD uses tabs
-rw-r--r--git/test/db/cmd/test_base.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/git/test/db/cmd/test_base.py b/git/test/db/cmd/test_base.py
index 9eee7223..2b9d9f69 100644
--- a/git/test/db/cmd/test_base.py
+++ b/git/test/db/cmd/test_base.py
@@ -37,7 +37,7 @@ class TestBase(RepoBase):
def test_fetch_info(self):
# assure we can handle remote-tracking branches
- fetch_info_line_fmt = "c437ee5deb8d00cf02f03720693e4c802e99f390 not-for-merge %s '0.3' of git://github.com/gitpython-developers/GitPython"
+ fetch_info_line_fmt = "c437ee5deb8d00cf02f03720693e4c802e99f390\tnot-for-merge\t%s '0.3' of git://github.com/gitpython-developers/GitPython"
remote_info_line_fmt = "* [new branch] nomatter -> %s"
fi = CmdFetchInfo._from_line(self.rorepo,
remote_info_line_fmt % "local/master",