From: Jeff King <peff@peff.net>
To: Thomas Gummerer <t.gummerer@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [RFC/PATCH] reset --hard: make use of the pretty machinery
Date: Fri, 2 Feb 2018 02:15:18 -0500 [thread overview]
Message-ID: <20180202071518.GB16533@sigill.intra.peff.net> (raw)
In-Reply-To: <20180201205721.30087-1-t.gummerer@gmail.com>
On Thu, Feb 01, 2018 at 08:57:21PM +0000, Thomas Gummerer wrote:
> It is a slight change of the output if the second line of the commit
> message is not a blank line, i.e. if the commit message is
>
> foo
> bar
>
> previously we would print "HEAD is now at 000000 foo", while after
> this change we print "HEAD is now at 000000 foo bar", same as 'git log
> --oneline' shows "000000 foo bar".
>
> So this does make the output more consistent with other commands, and
> 'reset' is a porcelain command, so nobody should be parsing the output
> in scripts.
Yeah, I'd say it's definitely fine to change the (already translated!)
stderr output of git-reset. I agree that it's an improvement to be
consistent with other commands here.
> The current behaviour dates back to 0e5a7faa3a ("Make "git reset" a
> builtin.", 2007-09-11), so I assume (without digging into the old
> codebase too much) that the logic was implemented because there was
> no convenience function such as 'pp_commit_easy' that would do this
> already.
Yes, there used to be quite a lot of ad hoc parsing of commit objects,
but these days we have safer and more readable alternatives. Even
without the visible behavior change, I think it would be worth doing
this patch just as a code cleanup.
> + struct strbuf buf = STRBUF_INIT;
> +
> + printf(_("HEAD is now at %s"),
> + find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV));
> +
> + pp_commit_easy(CMIT_FMT_ONELINE, commit, &buf);
> + if (buf.len > 0)
> + printf(" %s", buf.buf);
> + putchar('\n');
> + strbuf_release(&buf);
I was disappointed you still had to call find_unique_abbrev(). It seems
like we ought to be able to do this in a single formatting call. But
CMIT_FMT_ONELINE is just about the subject, and doesn't include the hash
at all. There's no equivalent without turning to the user-format code.
You can do:
struct pretty_print_context ctx = {0, DEFAULT_ABBREV};
format_commit_message(commit, _("HEAD is now at %H %s"), &buf, &ctx);
puts(buf.buf);
but I was annoyed at having to say "DEFAULT_ABBREV". It seems like that
ought to be the default.
Anyway, I'm fine with your patch as-is. I just needed a little
formatting code-golf in my day.
-Peff
next prev parent reply other threads:[~2018-02-02 7:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-01 20:57 [RFC/PATCH] reset --hard: make use of the pretty machinery Thomas Gummerer
2018-02-02 7:15 ` Jeff King [this message]
2018-02-02 20:16 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180202071518.GB16533@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=t.gummerer@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.
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).