Commit a99bc27
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: Роман Донченко <[email protected]>
Signed-off-by: Paul Mackerras <[email protected]>1 parent 2faa6cd commit a99bc27
1 file changed
+3
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8231 | 8231 | | |
8232 | 8232 | | |
8233 | 8233 | | |
8234 | | - | |
8235 | | - | |
8236 | 8234 | | |
8237 | | - | |
| 8235 | + | |
| 8236 | + | |
| 8237 | + | |
8238 | 8238 | | |
8239 | 8239 | | |
8240 | 8240 | | |
| |||
0 commit comments