git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jacob Keller <jacob.keller@gmail.com>
To: Stefan Beller <sbeller@google.com>
Cc: Junio C Hamano <gitster@pobox.com>,
	Git mailing list <git@vger.kernel.org>
Subject: Re: [RESEND PATCH] diff: recurse into nested submodules for inline diff
Date: Fri, 5 May 2017 18:24:42 -0700	[thread overview]
Message-ID: <CA+P7+xqMNiHGi=NVjTHCmnkk3u2BVC5Kfs6p6S3m+LwZr6vkaQ@mail.gmail.com> (raw)
In-Reply-To: <20170504214355.14179-1-sbeller@google.com>

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.

Thanks,
Jake

  reply	other threads:[~2017-05-06  1:25 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-04 21:43 [RESEND PATCH] diff: recurse into nested submodules for inline diff Stefan Beller
2017-05-06  1:24 ` Jacob Keller [this message]
2017-05-08  0:46   ` Junio C Hamano

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='CA+P7+xqMNiHGi=NVjTHCmnkk3u2BVC5Kfs6p6S3m+LwZr6vkaQ@mail.gmail.com' \
    --to=jacob.keller@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=sbeller@google.com \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public 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).