Skip to content

Commit

Permalink
gitk: Show diffs for boundary commits
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Paul Mackerras committed Mar 30, 2006
1 parent 16c1ff9 commit 7b5ff7e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions gitk
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down

0 comments on commit 7b5ff7e

Please sign in to comment.