git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: "Роман Донченко" <dpb@corrigendum.ru>
To: Paul Mackerras <paulus@ozlabs.org>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] gitk: fix the context menu not appearing in the presence of submodule diffs
Date: Thu, 30 Apr 2020 02:11:04 +0300	[thread overview]
Message-ID: <58d9c60c-1b0c-ef59-0355-da6edcbc8cdf@corrigendum.ru> (raw)
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: Роман Донченко <dpb@corrigendum.ru>
> 
> Thanks, applied.
> 
> Paul.
> 

      reply	other threads:[~2020-04-29 23:19 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-15 18:25 Роман Донченко
2020-04-13  5:11 ` Paul Mackerras
2020-04-29 23:11   ` Роман Донченко [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=58d9c60c-1b0c-ef59-0355-da6edcbc8cdf@corrigendum.ru \
    --to=dpb@corrigendum.ru \
    --cc=git@vger.kernel.org \
    --cc=paulus@ozlabs.org \
    --subject='Re: [PATCH] gitk: fix the context menu not appearing in the presence of submodule diffs' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).