From: Роман Донченко Date: Wed, 29 Apr 2020 23:11:04 GMT Subject: Re: [PATCH] gitk: fix the context menu not appearing in the presence of submodule diffs Message-ID: <58d9c60c-1b0c-ef59-0355-da6edcbc8cdf@corrigendum.ru> In-Reply-To: <20200413051151.GB14888@blackberry> Hi, I just checked the repository, and it doesn't seem like it's actually applied... -Roman. 13.04.2020 8:11, Paul Mackerras пишет: > On Sun, Dec 15, 2019 at 09:25:50PM +0300, Роман Донченко wrote: >> 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: Роман Донченко > > Thanks, applied. > > Paul. >