diff options
| author | Paul Sowden <paul@idontsmoke.co.uk> | 2008-11-19 23:03:54 -0800 |
|---|---|---|
| committer | Michael Trier <mtrier@gmail.com> | 2008-12-15 14:06:03 -0500 |
| commit | 5bb812243dd1815651281a54c8191fc8e2bc2d82 (patch) | |
| tree | ce472b595fa84369fc34fc0051894f4e9d701b9c /test/git/test_commit.py | |
| parent | 5117c9c8a4d3af19a9958677e45cda9269de1541 (diff) | |
| download | gitpython-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_commit.py')
| -rw-r--r-- | test/git/test_commit.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/git/test_commit.py b/test/git/test_commit.py index e9336f2c..df9ea039 100644 --- a/test/git/test_commit.py +++ b/test/git/test_commit.py @@ -22,7 +22,7 @@ class TestCommit(object): assert_equal("tom@mojombo.com", commit.author.email) 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_id_abbrev(self, git): @@ -184,7 +184,7 @@ class TestCommit(object): assert_equal(["a.txt", "b.txt"], keys) assert_true(git.called) - assert_equal(git.call_args, (('diff', '634396b2f541a9f2d58b00be1a07f0c358b999b3'), {'numstat': True})) + assert_equal(git.call_args, (('diff', '634396b2f541a9f2d58b00be1a07f0c358b999b3', '--'), {'numstat': True})) @patch_object(Git, '_call_process') def test_rev_list_bisect_all(self, git): |