From 6b747d99cbc91f446029afd4b5afa8608f619290 Mon Sep 17 00:00:00 2001
From: Correl Roush <correl@gmail.com>
Date: Fri, 19 Nov 2010 10:00:52 -0500
Subject: [PATCH] BUG - Diffing some merge commits was causing nasty errors.
 Diffing only the first parent for now.

---
 lib/vcs.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/vcs.py b/lib/vcs.py
index aea469d..2fd2f56 100644
--- a/lib/vcs.py
+++ b/lib/vcs.py
@@ -164,7 +164,10 @@ class Git(VCS):
         result = []
         b = self._repo.commit(b)
         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:
             a = self._repo.commit(a)
         for diff in b.diff(a):