git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Linus Arver <linusa@google.com>
To: Jeff King <peff@peff.net>, Kristoffer Haugsbakk <code@khaugsbakk.name>
Cc: Christian Couder <chriscool@tuxfamily.org>,
	"eric.frederich@siemens.com" <eric.frederich@siemens.com>,
	"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Possible bug regarding trailers
Date: Fri, 16 Jun 2023 15:28:53 -0700	[thread overview]
Message-ID: <owlyzg4z59ei.fsf@fine.c.googlers.com> (raw)
In-Reply-To: <20230616042407.GA54009@coredump.intra.peff.net>

Hello Peff,

Jeff King <peff@peff.net> writes:

> So I think the only bug is that "commit --trailer" should not respect
> the divider. And the fix presumably:

> diff --git a/builtin/commit.c b/builtin/commit.c
> index e67c4be221..9f4448f6b9 100644
> --- a/builtin/commit.c
> +++ b/builtin/commit.c
> @@ -1043,7 +1043,8 @@ static int prepare_to_commit(const char  
> *index_file, const char *prefix,
>   		struct child_process run_trailer = CHILD_PROCESS_INIT;

>   		strvec_pushl(&run_trailer.args, "interpret-trailers",
> -			     "--in-place", git_path_commit_editmsg(), NULL);
> +			     "--in-place", "--no-divider",
> +			     git_path_commit_editmsg(), NULL);
>   		strvec_pushv(&run_trailer.args, trailer_args.v);
>   		run_trailer.git_cmd = 1;
>   		if (run_command(&run_trailer))

> I cannot think of a reason we wouldn't want to do that (though obviously
> it would need a test to become a patch).

I would like to work on this patch. I should be able to push something
up in a couple weeks.

  parent reply	other threads:[~2023-06-16 22:28 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-15 17:46 Possible bug regarding trailers eric.frederich
2023-06-15 19:03 ` Kristoffer Haugsbakk
2023-06-16  4:24   ` Jeff King
2023-06-16 18:19     ` Christian Couder
2023-06-17  4:26       ` [PATCH] commit: pass --no-divider to interpret-trailers Jeff King
2023-06-19 15:13         ` Christian Couder
2023-06-16 22:28     ` Linus Arver [this message]
2023-06-17  4:27       ` Possible bug regarding trailers Jeff King
2023-06-16 15:07   ` eric.frederich
2023-06-16 18:37     ` Christian Couder
2023-06-16 23:49     ` Linus Arver

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=owlyzg4z59ei.fsf@fine.c.googlers.com \
    --to=linusa@google.com \
    --cc=chriscool@tuxfamily.org \
    --cc=code@khaugsbakk.name \
    --cc=eric.frederich@siemens.com \
    --cc=git@vger.kernel.org \
    --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).