From: Junio C Hamano <gitster@pobox.com>
To: Dominique Martinet <asmadeus@codewreck.org>
Cc: "Jeff King" <peff@peff.net>,
git@vger.kernel.org, "René Scharfe" <l.s.r@web.de>,
"Julien Moutinho" <julm@sourcephile.fr>
Subject: Re: [RFC PATCH] builtin/format-patch: print a warning for skipped merge commits?
Date: Sun, 04 Jan 2026 11:27:01 +0900 [thread overview]
Message-ID: <xmqqy0mep0y2.fsf@gitster.g> (raw)
In-Reply-To: <aVkKmcER2K8D9U4T@codewreck.org> (Dominique Martinet's message of "Sat, 3 Jan 2026 21:24:57 +0900")
Dominique Martinet <asmadeus@codewreck.org> writes:
> Okay, I can see this being confusing to people not used to format-patch
> even with a range, but I agree it'll be annoying more often than not in
> general so I'm fine with this.
Yup, nobody stays to be newbie forever ;-).
> It makes it a bit cumbersome to print details about the commit(s) being
> skipped though, so it's probably simpler to do a generic message like
> "No patch generated. Note merge commits are skipped." like this?
Or queue these merge commits in another commit list instead of a
single boolean "seen_merge". The warning is issued only on the
error path, so as long as accumulation phase is cheap enough to
record information necessary to later create detailed messages, the
location you added a single warning() call can call a new helper
function that gives more details like commit log messages, etc., if
we wanted to. Or seen_merge can become a counter and the warning
message can become a simpler "skipped %d merges".
next prev parent reply other threads:[~2026-01-04 2:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-31 3:42 [RFC PATCH] builtin/format-patch: print a warning for skipped merge commits? Dominique Martinet
2025-12-31 5:12 ` Junio C Hamano
2026-01-03 12:24 ` Dominique Martinet
2026-01-04 2:27 ` Junio C Hamano [this message]
2026-02-01 8:38 ` Dominique Martinet
2026-01-02 7:33 ` Jeff King
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=xmqqy0mep0y2.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=asmadeus@codewreck.org \
--cc=git@vger.kernel.org \
--cc=julm@sourcephile.fr \
--cc=l.s.r@web.de \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.