From: "Govind Salinas" <blix@sophiasuchtig.com>
To: "Junio C Hamano" <gitster@pobox.com>
Cc: "Jeff King" <peff@peff.net>,
git@vger.kernel.org, "Adam Simpkins" <adam@adamsimpkins.net>
Subject: Re: [PATCH 2/4] log and rev-list: Fixed newline termination issues with --graph
Date: Mon, 7 Apr 2008 19:25:28 -0500 [thread overview]
Message-ID: <5d46db230804071725r44694e76l3d6e63aabc67f372@mail.gmail.com> (raw)
In-Reply-To: <7vmyo5nr2h.fsf@gitster.siamese.dyndns.org>
On Mon, Apr 7, 2008 at 7:11 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Junio C Hamano <gitster@pobox.com> writes:
>
> > (2) Presence of %n in "--pretty=format:..." means a multi-line output and
> > uses separator as before; lack of %n means it is a one-line format
> > and uses terminator.
>
> After thinking about this a bit more, I think a slight variant of the
> above probably is the least intrusive both from code and semantics point
> of view, and would match end-user expectations pretty well.
>
> This attached patch introduces a single bit "use_terminator" in "struct
> rev_info", which is normally false (i.e. most formats use separator
> semantics) but by flipping it to true, you can ask for terminator
> semantics just like oneline format does.
>
> The function get_commit_format(), which is what parses "--pretty=" option,
> now takes a pointer to "struct rev_info" and updates its commit_format and
> use_terminator fields. It used to return the value of type "enum
> cmit_fmt", but all the callers assigned it to rev->commit_format.
>
> There are only two cases the code turns use_terminator on. Obviously, the
> traditional oneline format (--pretty=oneline) is one of them, and the new
> case is --pretty=format:... that does not end with "%n".
>
> When the custom format "--pretty=format:" is:
>
> "A: %an <%ae>%nC: %cn <%ce>%n"
>
> it represents a record with two lines (author and committer), and these
> are output with an extra LF in between, just like the regular --pretty
> without customization will get an extra separator. The custom format
>
> "A: %an <%ae> C: %cn <%ce>"
>
> will give a one-line-per-commit output, each of which is terminated with
> LF. And
>
> "A: %an <%ae>%nC: %cn <%ce>"
>
> will give two line per commit without extra separator.
>
Hi,
Shouldn't whatever option is used here respect line_terminator such
that it will use NULL bytes when -z is used? Having watched this
discussion, it seems like you really want an option --whatever that
forces a record terminator between records and, I assume, at the end.
I have not seen anyone suggest it, perhaps I missed it.
-Govind
next prev parent reply other threads:[~2008-04-08 0:26 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-06 18:42 [PATCH 1/4] Add history graph API Adam Simpkins
2008-04-06 18:42 ` [PATCH 2/4] graph API: Added additional utility functions to the " Adam Simpkins
2008-04-06 18:42 ` [PATCH 3/4] git log and git rev-list: Add --graph option Adam Simpkins
2008-04-06 18:42 ` [PATCH 4/4] git log: Updated --graph to work even when the commit list is pruned Adam Simpkins
2008-04-06 21:47 ` [PATCH 5/5] Document the new --graph option for log and rev-list Adam Simpkins
2008-04-07 8:01 ` [PATCH 1/4] graph API: Fixed coding style problems Adam Simpkins
2008-04-07 8:01 ` [PATCH 2/4] log and rev-list: Fixed newline termination issues with --graph Adam Simpkins
2008-04-07 8:01 ` [PATCH 3/4] log and rev-list: Fix --graph output with --pretty=email Adam Simpkins
2008-04-07 8:01 ` [PATCH 4/4] log and rev-list: Improve --graph output when commits have been pruned Adam Simpkins
2008-04-07 8:21 ` [PATCH 2/4] log and rev-list: Fixed newline termination issues with --graph Junio C Hamano
2008-04-07 8:52 ` Junio C Hamano
2008-04-07 13:17 ` Jeff King
2008-04-07 17:43 ` Junio C Hamano
2008-04-07 19:01 ` Adam Simpkins
2008-04-07 13:19 ` Jakub Narebski
2008-04-08 0:11 ` Junio C Hamano
2008-04-08 0:25 ` Govind Salinas [this message]
2008-04-08 0:58 ` Junio C Hamano
2008-04-06 21:15 ` [PATCH 3/4] git log and git rev-list: Add --graph option Teemu Likonen
2008-04-06 22:51 ` Adam Simpkins
2008-04-06 20:30 ` [PATCH 1/4] Add history graph API Teemu Likonen
2008-04-06 21:44 ` Adam Simpkins
2008-04-06 20:42 ` Johannes Schindelin
2008-04-06 22:47 ` Adam Simpkins
2008-04-07 5:24 ` Teemu Likonen
2008-04-07 8:34 ` Adam Simpkins
2008-04-07 8:56 ` Teemu Likonen
2008-04-06 21:06 ` Johannes Schindelin
2008-04-06 22:04 ` Adam Simpkins
2008-04-06 22:15 ` Johannes Schindelin
2008-04-06 22:58 ` Adam Simpkins
2008-04-07 16:15 ` Linus Torvalds
2008-04-07 3:12 ` Junio C Hamano
2008-04-06 21:25 ` [PATCH] bash: Add command line completion of --graph (git log) Teemu Likonen
2008-04-07 12:25 ` [PATCH v2] bash: Add more command line option completions for 'git log' Teemu Likonen
2008-04-07 7:26 ` [PATCH 1/4] Add history graph API Teemu Likonen
2008-04-07 8:06 ` Adam Simpkins
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5d46db230804071725r44694e76l3d6e63aabc67f372@mail.gmail.com \
--to=blix@sophiasuchtig.com \
--cc=adam@adamsimpkins.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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.
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 NNTP newsgroup(s).