FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

remove ambiguity between paths and treeishs · og-python-scripts/GitPython@5bb8122 · GitHub

  1. og-python-scripts
  2. GitPython

Repository navigation

Commit 5bb8122

Browse files
Paul Sowden
authored and
empty
committed
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)
1 parent 5117c9c commit 5bb8122

4 files changed

Lines changed: 17 additions & 18 deletions

File tree

‎lib/git/commit.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def count(cls, repo, ref):
9595
Returns
9696
int
9797
"""
98-
return len(repo.git.rev_list(ref).strip().splitlines())
98+
return len(repo.git.rev_list(ref, '--').strip().splitlines())
9999

100100
@classmethod
101101
def find_all(cls, repo, ref, **kwargs):
@@ -118,7 +118,7 @@ def find_all(cls, repo, ref, **kwargs):
118118
options = {'pretty': 'raw'}
119119
options.update(kwargs)
120120

121-
output = repo.git.rev_list(ref, **options)
121+
output = repo.git.rev_list(ref, '--', **options)
122122
return cls.list_from_string(repo, output)
123123

124124
@classmethod
@@ -214,14 +214,14 @@ def diffs(self):
214214
@property
215215
def stats(self):
216216
if not self.parents:
217-
text = self.repo.git.diff(self.id, numstat=True)
217+
text = self.repo.git.diff(self.id, '--', numstat=True)
218218
text2 = ""
219219
for line in text.splitlines():
220220
(insertions, deletions, filename) = line.split("\t")
221221
text2 += "%s\t%s\t%s\n" % (deletions, insertions, filename)
222222
text = text2
223223
else:
224-
text = self.repo.git.diff(self.parents[0].id, self.id, numstat=True)
224+
text = self.repo.git.diff(self.parents[0].id, self.id, '--', numstat=True)
225225
return stats.Stats.list_from_string(self.repo, text)
226226

227227
def __str__(self):

‎lib/git/repo.py‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,8 @@ def commit_deltas_from(self, other_repo, ref = 'master', other_ref = 'master'):
192192
Returns
193193
``git.Commit[]``
194194
"""
195-
repo_refs = self.git.rev_list(ref).strip().splitlines()
196-
other_repo_refs = other_repo.git.rev_list(other_ref).strip().splitlines()
195+
repo_refs = self.git.rev_list(ref, '--').strip().splitlines()
196+
other_repo_refs = other_repo.git.rev_list(other_ref, '--').strip().splitlines()
197197

198198
diff_refs = list(set(other_repo_refs) - set(repo_refs))
199199
return map(lambda ref: Commit.find_all(other_repo, ref, max_count=1)[0], diff_refs)
@@ -236,10 +236,9 @@ def log(self, commit = 'master', path = None, **kwargs):
236236
"""
237237
options = {'pretty': 'raw'}
238238
options.update(kwargs)
239+
arg = [commit, '--']
239240
if path:
240-
arg = [commit, '--', path]
241-
else:
242-
arg = [commit]
241+
arg.append(path)
243242
commits = self.git.log(*arg, **options)
244243
return Commit.list_from_string(self, commits)
245244

@@ -450,7 +449,7 @@ def is_dirty(self):
450449
# always consired to be clean.
451450
return False
452451

453-
return len(self.git.diff('HEAD').strip()) > 0
452+
return len(self.git.diff('HEAD', '--').strip()) > 0
454453

455454
@property
456455
def active_branch(self):

‎test/git/test_commit.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def test_bake(self, git):
2222
assert_equal("tom@mojombo.com", commit.author.email)
2323

2424
assert_true(git.called)
25-
assert_equal(git.call_args, (('rev_list', '4c8124ffcf4039d292442eeccabdeca5af5c5017'), {'pretty': 'raw', 'max_count': 1}))
25+
assert_equal(git.call_args, (('rev_list', '4c8124ffcf4039d292442eeccabdeca5af5c5017', '--'), {'pretty': 'raw', 'max_count': 1}))
2626

2727
@patch_object(Git, '_call_process')
2828
def test_id_abbrev(self, git):
@@ -184,7 +184,7 @@ def test_stats(self, git):
184184
assert_equal(["a.txt", "b.txt"], keys)
185185

186186
assert_true(git.called)
187-
assert_equal(git.call_args, (('diff', '634396b2f541a9f2d58b00be1a07f0c358b999b3'), {'numstat': True}))
187+
assert_equal(git.call_args, (('diff', '634396b2f541a9f2d58b00be1a07f0c358b999b3', '--'), {'numstat': True}))
188188

189189
@patch_object(Git, '_call_process')
190190
def test_rev_list_bisect_all(self, git):

‎test/git/test_repo.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def test_commits(self, git):
7070
assert_equal("Merge branch 'site'", c.message)
7171

7272
assert_true(git.called)
73-
assert_equal(git.call_args, (('rev_list', 'master'), {'skip': 0, 'pretty': 'raw', 'max_count': 10}))
73+
assert_equal(git.call_args, (('rev_list', 'master', '--'), {'skip': 0, 'pretty': 'raw', 'max_count': 10}))
7474

7575
@patch_object(Git, '_call_process')
7676
def test_commit_count(self, git):
@@ -79,7 +79,7 @@ def test_commit_count(self, git):
7979
assert_equal(655, self.repo.commit_count('master'))
8080

8181
assert_true(git.called)
82-
assert_equal(git.call_args, (('rev_list', 'master'), {}))
82+
assert_equal(git.call_args, (('rev_list', 'master', '--'), {}))
8383

8484
@patch_object(Git, '_call_process')
8585
def test_commit(self, git):
@@ -90,7 +90,7 @@ def test_commit(self, git):
9090
assert_equal("4c8124ffcf4039d292442eeccabdeca5af5c5017", commit.id)
9191

9292
assert_true(git.called)
93-
assert_equal(git.call_args, (('rev_list', '4c8124ffcf4039d292442eeccabdeca5af5c5017'), {'pretty': 'raw', 'max_count': 1}))
93+
assert_equal(git.call_args, (('rev_list', '4c8124ffcf4039d292442eeccabdeca5af5c5017', '--'), {'pretty': 'raw', 'max_count': 1}))
9494

9595
@patch_object(Git, '_call_process')
9696
def test_tree(self, git):
@@ -269,7 +269,7 @@ def test_log(self, git):
269269
assert_equal('ab25fd8483882c3bda8a458ad2965d2248654335', self.repo.log()[-1].id)
270270
assert_true(git.called)
271271
assert_equal(git.call_count, 2)
272-
assert_equal(git.call_args, (('log', 'master'), {'pretty': 'raw'}))
272+
assert_equal(git.call_args, (('log', 'master', '--'), {'pretty': 'raw'}))
273273

274274
@patch_object(Git, '_call_process')
275275
def test_log_with_path_and_options(self, git):
@@ -314,14 +314,14 @@ def test_is_dirty_with_clean_working_dir(self, git):
314314
self.repo.bare = False
315315
git.return_value = ''
316316
assert_false(self.repo.is_dirty)
317-
assert_equal(git.call_args, (('diff', 'HEAD'), {}))
317+
assert_equal(git.call_args, (('diff', 'HEAD', '--'), {}))
318318

319319
@patch_object(Git, '_call_process')
320320
def test_is_dirty_with_dirty_working_dir(self, git):
321321
self.repo.bare = False
322322
git.return_value = '''-aaa\n+bbb'''
323323
assert_true(self.repo.is_dirty)
324-
assert_equal(git.call_args, (('diff', 'HEAD'), {}))
324+
assert_equal(git.call_args, (('diff', 'HEAD', '--'), {}))
325325

326326
@patch_object(Git, '_call_process')
327327
def test_active_branch(self, git):

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL