git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [RESEND PATCH] diff: recurse into nested submodules for inline diff

From
Junio C Hamano <gitster@pobox.com>
Date
May 8, 2017, 00:46 UTC
Message-ID
<xmqqfuggcgzt.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<CA+P7+xqMNiHGi=NVjTHCmnkk3u2BVC5Kfs6p6S3m+LwZr6vkaQ@mail.gmail.com>
Jacob Keller <jacob.keller@gmail.com> writes:
Show 24 quoted lines
> On Thu, May 4, 2017 at 2:43 PM, Stefan Beller <sbeller@google.com> wrote:
>> When fd47ae6a5b (diff: teach diff to display submodule difference with an
>> inline diff, 2016-08-31) was introduced, we did not think of recursing
>> into nested submodules.
>>
>> When showing the inline diff for submodules, automatically recurse
>> into nested submodules as well with inline submodule diffs.
>>
>> Signed-off-by: Stefan Beller <sbeller@google.com>
>> ---
>>
>> This is a resend of
>> https://public-inbox.org/git/20170331231733.11123-3-sbeller@google.com/
>>
>> In the cover letter of that patch, I said I would want to redo the tests with
>> scrubbed output. However given the widespread use of unscrubbed output,
>> I think this is fine as-is to include.
>>
>> Thanks,
>> Stefan
>
> Fix looks obviously correct to me. I would like to change the tests to
> not use the unscrubbed output, but that's a problem for a separate
> patch.
OK.
Thanks, both.
Previous: Jacob Keller
Message 3 of 3 in “diff: recurse into nested submodules for inline diff”
  1. diff: recurse into nested submodules for inline diffStefan Beller, May 4, 2017
  2. Jacob KellerMay 6, 2017
  3. Junio C HamanoMay 8, 2017

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.