summaryrefslogtreecommitdiff
path: root/test/git/test_repo.py
diff options
context:
space:
mode:
authorPaul Sowden <paul@idontsmoke.co.uk>2008-11-19 23:03:54 -0800
committerMichael Trier <mtrier@gmail.com>2008-12-15 14:06:03 -0500
commit5bb812243dd1815651281a54c8191fc8e2bc2d82 (patch)
treece472b595fa84369fc34fc0051894f4e9d701b9c /test/git/test_repo.py
parent5117c9c8a4d3af19a9958677e45cda9269de1541 (diff)
downloadgitpython-5bb812243dd1815651281a54c8191fc8e2bc2d82.tar.gz
remove ambiguity between paths and treeishs
When calling commands that accept treeish and path arguments and there is a path with the same name as a treeish git cowardly refuses to pick one and asks for the command to use the unambiguous syntax where '--' seperates the treeish from the paths. Add '--' to the git commands to indicate that the argument is a treeish and not a path. (cherry picked from commit a9a57fa93a2b121ab9b17fcd6062b9a9c9740883)
Diffstat (limited to 'test/git/test_repo.py')
-rw-r--r--test/git/test_repo.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/git/test_repo.py b/test/git/test_repo.py
index 79c2dd8c..67489b39 100644
--- a/test/git/test_repo.py
+++ b/test/git/test_repo.py
@@ -70,7 +70,7 @@ class TestRepo(object):
assert_equal("Merge branch 'site'", c.message)
assert_true(git.called)
- assert_equal(git.call_args, (('rev_list', 'master'), {'skip': 0, 'pretty': 'raw', 'max_count': 10}))
+ assert_equal(git.call_args, (('rev_list', 'master', '--'), {'skip': 0, 'pretty': 'raw', 'max_count': 10}))
@patch_object(Git, '_call_process')
def test_commit_count(self, git):
@@ -79,7 +79,7 @@ class TestRepo(object):
assert_equal(655, self.repo.commit_count('master'))
assert_true(git.called)
- assert_equal(git.call_args, (('rev_list', 'master'), {}))
+ assert_equal(git.call_args, (('rev_list', 'master', '--'), {}))
@patch_object(Git, '_call_process')
def test_commit(self, git):
@@ -90,7 +90,7 @@ class TestRepo(object):
assert_equal("4c8124ffcf4039d292442eeccabdeca5af5c5017", commit.id)
assert_true(git.called)
- assert_equal(git.call_args, (('rev_list', '4c8124ffcf4039d292442eeccabdeca5af5c5017'), {'pretty': 'raw', 'max_count': 1}))
+ assert_equal(git.call_args, (('rev_list', '4c8124ffcf4039d292442eeccabdeca5af5c5017', '--'), {'pretty': 'raw', 'max_count': 1}))
@patch_object(Git, '_call_process')
def test_tree(self, git):
@@ -269,7 +269,7 @@ class TestRepo(object):
assert_equal('ab25fd8483882c3bda8a458ad2965d2248654335', self.repo.log()[-1].id)
assert_true(git.called)
assert_equal(git.call_count, 2)
- assert_equal(git.call_args, (('log', 'master'), {'pretty': 'raw'}))
+ assert_equal(git.call_args, (('log', 'master', '--'), {'pretty': 'raw'}))
@patch_object(Git, '_call_process')
def test_log_with_path_and_options(self, git):
@@ -314,14 +314,14 @@ class TestRepo(object):
self.repo.bare = False
git.return_value = ''
assert_false(self.repo.is_dirty)
- assert_equal(git.call_args, (('diff', 'HEAD'), {}))
+ assert_equal(git.call_args, (('diff', 'HEAD', '--'), {}))
@patch_object(Git, '_call_process')
def test_is_dirty_with_dirty_working_dir(self, git):
self.repo.bare = False
git.return_value = '''-aaa\n+bbb'''
assert_true(self.repo.is_dirty)
- assert_equal(git.call_args, (('diff', 'HEAD'), {}))
+ assert_equal(git.call_args, (('diff', 'HEAD', '--'), {}))
@patch_object(Git, '_call_process')
def test_active_branch(self, git):