From: Alexander Potashev <aspotashev@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Nathan W. Panike" <nathan.panike@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCH] Get format-patch to show first commit after root commit
Date: Sat, 10 Jan 2009 14:36:42 +0300 [thread overview]
Message-ID: <20090110113642.GA25723@myhost> (raw)
In-Reply-To: <7vmye0yohu.fsf@gitster.siamese.dyndns.org>
Hello, Junio!
> I think the attached would be a better patch. We already have a
> configuration to control if we show the patch for a root commit by
> default, and we can use reuse it here. The configuration defaults to true
> these days.
>
> Because the code before the hunk must check if the user said "--root
> commit" or just "commit" from the command line and behave quite
> differently by looking at rev.show_root_diff, we cannot do this assignment
> before the command line parsing like other commands in the log family.
I think the problem was not only format-patch misbehaviour. If you use
"log.showroot = no", you still get an empty patch file, which is not
very good, because format-patch doesn't work very well, it creates
_corrupt_ patches! It's much better to not create the patch file at all
in this case.
However, it has nothing in common with your patch, but there's room for
another commit.
>
> builtin-log.c | 8 ++++++++
> 1 files changed, 8 insertions(+), 0 deletions(-)
>
> diff --git c/builtin-log.c w/builtin-log.c
> index 4a02ee9..2d2c111 100644
> --- c/builtin-log.c
> +++ w/builtin-log.c
> @@ -935,6 +935,14 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
> * get_revision() to do the usual traversal.
> */
> }
> +
> + /*
> + * We cannot move this anywhere earlier because we do want to
> + * know if --root was given explicitly from the comand line.
> + */
> + if (default_show_root)
> + rev.show_root_diff = 1;
> +
> if (cover_letter) {
> /* remember the range */
> int i;
next prev parent reply other threads:[~2009-01-10 11:38 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-09 21:33 [PATCH] Get format-patch to show first commit after root commit Nathan W. Panike
2009-01-10 0:49 ` Junio C Hamano
2009-01-10 1:37 ` Nathan W. Panike
2009-01-10 11:36 ` Alexander Potashev [this message]
2009-01-10 11:39 ` [PATCH] format-patch: avoid generation of empty patches Alexander Potashev
2009-01-10 16:01 ` Nathan W. Panike
2009-01-10 16:17 ` Alexander Potashev
2009-01-10 18:07 ` Nathan W. Panike
2009-01-10 20:41 ` Junio C Hamano
2009-01-10 16:39 ` [PATCH] Add new testcases for format-patch root commits Alexander Potashev
2009-01-10 18:33 ` Alexander Potashev
-- strict thread matches above, loose matches on Subject: below --
2009-01-09 19:35 [PATCH] Get format-patch to show first commit after root commit Nathan W. Panike
2009-01-09 20:29 ` Alexander Potashev
2009-01-09 19:02 (unknown) nathan.panike
2009-01-10 10:27 ` [PATCH] Get format-patch to show first commit after root commit Johannes Schindelin
2009-01-10 10:35 ` Johannes Schindelin
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=20090110113642.GA25723@myhost \
--to=aspotashev@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=nathan.panike@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).