gitk: Show diffs for boundary commits
authorPaul Mackerras <paulus@samba.org>
Thu, 30 Mar 2006 09:50:40 +0000 (20:50 +1100)
committerPaul Mackerras <paulus@samba.org>
Thu, 30 Mar 2006 09:50:40 +0000 (20:50 +1100)
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>
gitk
diff --git a/gitk b/gitk
index 1989aa5168a72cca924cf91836f24ee7212fd21f..b61e138268f380630fce3fb9cbd4ed667567ac7d 100755 (executable)
--- a/gitk
+++ b/gitk
@@ -2386,9 +2386,9 @@ proc selectline {l isnew} {
 
     $cflist delete 0 end
     $cflist insert end "Comments"
 
     $cflist delete 0 end
     $cflist insert end "Comments"
-    if {$nparents($id) == 1} {
+    if {$nparents($id) <= 1} {
        startdiff $id
        startdiff $id
-    } elseif {$nparents($id) > 1} {
+    } else {
        mergediff $id
     }
 }
        mergediff $id
     }
 }