summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-03-30 09:50:40 (GMT)
committerPaul Mackerras <paulus@samba.org>2006-03-30 09:50:40 (GMT)
commit7b5ff7e7d715391b9745a46fcfaacf1d97d4dc9f (patch)
tree7ce0043c36c365181656bf835190a490bf217815
parent16c1ff968ac9717c958129eb05aa089cc0ca51e7 (diff)
downloadgit-7b5ff7e7d715391b9745a46fcfaacf1d97d4dc9f.zip
git-7b5ff7e7d715391b9745a46fcfaacf1d97d4dc9f.tar.gz
git-7b5ff7e7d715391b9745a46fcfaacf1d97d4dc9f.tar.bz2
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>
-rwxr-xr-xgitk4
1 files changed, 2 insertions, 2 deletions
diff --git a/gitk b/gitk
index 1989aa5..b61e138 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
}
}