From: Junio C Hamano <gitster@pobox.com>
To: Jacob Keller <jacob.e.keller@intel.com>
Cc: git@vger.kernel.org, Jacob Keller <jacob.keller@gmail.com>
Subject: Re: [PATCH v5 2/3] diff: add --diff-line-prefix option for passing in a prefix
Date: Fri, 12 Aug 2016 14:15:52 -0700 [thread overview]
Message-ID: <xmqqvaz5vgc7.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20160811225946.18381-2-jacob.e.keller@intel.com> (Jacob Keller's message of "Thu, 11 Aug 2016 15:59:45 -0700")
Jacob Keller <jacob.e.keller@intel.com> writes:
> The prefix shall come first prior to any other prefix associated with
> the --graph option or other source.
>
> Add tests for the same.
>
> Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
> ---
> - v5
> * Changed name to --diff-line-prefix since --line-prefix might indicate
> for other commands such as log, when it only modifies diff output
As you are adding this to "diff.c", I think the option would be
visible to "git log" anyway, and more importantly
git log --line-prefix='I I ' --graph --boundary -p HEAD^..HEAD
should honor the line-prefix for the log message part. I'd expect
that its output would be like:
I I * commit 3c90ffd2f01e2d0d080c8e42df2ee89709b324de
I I | Author: Jacob Keller <jacob.keller@gmail.com>
I I | Date: Thu Aug 11 15:59:45 2016 -0700
I I |
I I | diff: add --diff-line-prefix option for passing in a prefix
I I |
I I | Add an option to pass additional prefix to be displayed before diff
I I | output. This feature will be used in a following patch to output correct
I I | ...
I I | Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
I I | Signed-off-by: Junio C Hamano <gitster@pobox.com>
I I |
I I | diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
I I | index 705a873..f924f57 100644
I I | --- a/Documentation/diff-options.txt
I I | +++ b/Documentation/diff-options.txt
I I | ...
Otherwise, a "git log --graph -p --submodule=log-with-diff", when
showing a commit in the superproject that changes submodule from
commit A to commit B, wouldn't be able to run "git log --graph -p A..B",
i.e. as if the command recursed beyond the module boundary, would
it?
next prev parent reply other threads:[~2016-08-12 21:15 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-11 22:59 [PATCH v5 1/3] diff.c: remove output_prefix_length field Jacob Keller
2016-08-11 22:59 ` [PATCH v5 2/3] diff: add --diff-line-prefix option for passing in a prefix Jacob Keller
2016-08-12 21:15 ` Junio C Hamano [this message]
2016-08-12 21:21 ` Jacob Keller
2016-08-12 21:43 ` Jacob Keller
[not found] ` <CAPc5daVmyx+EX8H0yETfO6Vv+A7DqBM5bsqrnJdYzbEhVnA1wQ@mail.gmail.com>
[not found] ` <CA+P7+xp_sPk6P1qyyDfOgpkXU1GxWPivfSzvveS4PAvGb-=ggQ@mail.gmail.com>
2016-08-14 21:21 ` Junio C Hamano
2016-08-15 5:32 ` Jacob Keller
2016-08-15 15:37 ` Junio C Hamano
2016-08-15 23:09 ` Jacob Keller
2016-08-11 22:59 ` [PATCH v5 3/3] diff: add SUBMODULE_DIFF format to display submodule diff Jacob Keller
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=xmqqvaz5vgc7.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jacob.e.keller@intel.com \
--cc=jacob.keller@gmail.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).