diff options
| author |  Роман Донченко <dpb@corrigendum.ru> | 2019-12-15 21:25:50 +0300 |
|---|---|---|
| committer |  Paul Mackerras <paulus@ozlabs.org> | 2020-04-13 15:11:18 +1000 |
| commit | a99bc27aec74071aa1e9ecaa12c642e88e377165 (patch) | |
| tree | d4489e6d118b61bc8ffa9fad8ca68066816953e9 /t/t4013/diff.noellipses-whatchanged_master | |
| parent | gitk: Un-hide selection in areas with non-default background color (diff) | |
| download | tgif-a99bc27aec74071aa1e9ecaa12c642e88e377165.tar.xz | |
gitk: fix the context menu not appearing in the presence of submodule diffs
Currently, submodule diffs can cause the diff context menu to fail
to appear because of a couple bugs in parseblobdiffline:
* it appends the submodule name to ctext_file_lines instead of
a line number, which breaks the binary search in find_ctext_fileinfo;
* it can desynchronize ctext_file_names and ctext_file_lines
by appending to the former but not the latter, which also breaks
find_ctext_fileinfo.
Fix both of these.
Note: a side effect of this patch is that the context menu also
starts appearing when you right-click on submodule diffs (and not just
regular diffs). The menu is non-functional in this case, though,
since you can't run blame on submodules.
Signed-off-by: Роман Донченко <dpb@corrigendum.ru>
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
Diffstat (limited to 't/t4013/diff.noellipses-whatchanged_master')
0 files changed, 0 insertions, 0 deletions