mirror of
https://github.com/git/git.git
synced 2024-11-01 23:07:55 +01:00
gitk: Fix context menu items for generating diffs when in tree mode
Currently, if you invoke the "diff this -> selected" or "diff selected -> this" and gitk is in "Tree" mode rather than "Patch" mode, the diff display pane will just show the header but not the actual diff, unless gitk has done the diff before and thus has the list of files that differ. This was because the logic in gettreediffline that checked whether we had moved on to doing something else checked the mode (Tree or Patch) before checking whether the ids we're diffing had changed. This fixes it. The new logic in gettreediffline is slightly hacky and relies on the fact that the Tree/Patch mode only applies when we're looking at a single commit, not at the diff between two commits. Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
68149a7197
commit
e11601381e
1 changed files with 1 additions and 1 deletions
2
gitk
2
gitk
|
@ -7129,7 +7129,7 @@ proc gettreediffline {gdtf ids} {
|
|||
set treediffs($ids) $treediff
|
||||
}
|
||||
unset treepending
|
||||
if {$cmitmode eq "tree"} {
|
||||
if {$cmitmode eq "tree" && [llength $diffids] == 1} {
|
||||
gettree $diffids
|
||||
} elseif {$ids != $diffids} {
|
||||
if {![info exists diffmergeid]} {
|
||||
|
|
Loading…
Reference in a new issue