github/codereview
1
0
Fork 0
mirror of https://github.com/correl/codereview.git synced 2024-11-23 19:19:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

BUG - Diffing some merge commits was causing nasty errors. Diffing only the first parent for now.

Browse source
This commit is contained in:
Correl Roush 2010-11-19 10:00:52 -05:00
parent 95477c9dc1
commit 6b747d99cb
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/vcs.py
View file

@ -164,7 +164,10 @@ class Git(VCS):
result = [] result = []
b = self._repo.commit(b) b = self._repo.commit(b)
if not a: if not a:
a = b.parents # FIXME:
# Only using the first parent for now. Some merge commits seem to be
# causing nasty problems, while others diff just fine.
a = b.parents[:1]
else: else:
a = self._repo.commit(a) a = self._repo.commit(a)
for diff in b.diff(a): for diff in b.diff(a):