From: Paul Mackerras <paulus@samba.org>
Date: Thu, 30 Mar 2006 09:50:40 +0000 (+1100)
Subject: gitk: Show diffs for boundary commits
X-Git-Tag: v1.3.0-rc2~24^2~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7b5ff7e7d715391b9745a46fcfaacf1d97d4dc9f;p=git.git

gitk: Show diffs for boundary commits

With this we run git-diff-tree on a commit even if we think it has
no parents, either because it really has no parents or because it
is a boundary commit.  This means that gitk shows the diff for a
boundary commit when it is selected.

Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/gitk b/gitk
index 1989aa516..b61e13826 100755
--- a/gitk
+++ b/gitk
@@ -2386,9 +2386,9 @@ proc selectline {l isnew} {
 
     $cflist delete 0 end
     $cflist insert end "Comments"
-    if {$nparents($id) == 1} {
+    if {$nparents($id) <= 1} {
 	startdiff $id
-    } elseif {$nparents($id) > 1} {
+    } else {
 	mergediff $id
     }
 }