From: Junio C Hamano <gitster@pobox.com>
To: Ross Kabus <rkabus@aerotech.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] commit-tree: don't append a newline with -F
Date: Fri, 08 Sep 2017 10:35:15 +0900 [thread overview]
Message-ID: <xmqqa8260y7g.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170907144111.7488-1-rkabus@aerotech.com> (Ross Kabus's message of "Thu, 7 Sep 2017 10:41:11 -0400")
Ross Kabus <rkabus@aerotech.com> writes:
> This change makes it such that commit-tree -F never appends a newline
> character to the supplied commit message (either from file or stdin).
>
> Previously, commit-tree -F would always append a newline character to
> the text brought in from file or stdin.
This is not correct. The command adds a missing newline only when
the input ended in an incompete line.
I'd rephrase the whole thing like this:
commit-tree: do not complete line in -F input
"git commit-tree -F <file>", unlike "cat <file> | git
commit-tree" (i.e. feeding the same contents from the standard
input), added a missing final newline when the input ended in an
incomplete line.
Correct this inconsistency by leaving the incomplete line as-is,
as erring on the side of not touching the input is preferrable
and expected for a plumbing command like "commit-tree".
if I were doing this patch.
Thanks.
> Signed-off-by: Ross Kabus <rkabus@aerotech.com>
> ---
> builtin/commit-tree.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c
> index 19e898fa4..2177251e2 100644
> --- a/builtin/commit-tree.c
> +++ b/builtin/commit-tree.c
> @@ -102,7 +102,6 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)
> if (fd && close(fd))
> die_errno("git commit-tree: failed to close '%s'",
> argv[i]);
> - strbuf_complete_line(&buffer);
> continue;
> }
next prev parent reply other threads:[~2017-09-08 1:35 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-07 14:41 [PATCH] commit-tree: don't append a newline with -F Ross Kabus
2017-09-08 1:35 ` Junio C Hamano [this message]
2017-09-08 22:06 ` Ross Kabus
2017-09-09 3:22 ` Junio C Hamano
2017-09-14 17:05 ` [PATCH v2] commit-tree: do not complete line in -F input Ross Kabus
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqa8260y7g.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=rkabus@aerotech.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).