From: Ross Kabus <rkabus@aerotech.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org, Ross Kabus <rkabus@aerotech.com>
Subject: [PATCH] commit-tree: don't append a newline with -F
Date: Thu, 7 Sep 2017 10:41:11 -0400 [thread overview]
Message-ID: <20170907144111.7488-1-rkabus@aerotech.com> (raw)
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 has caused confusion in a
number of ways:
- This is a plumbing command and it is generally expected not to do
text cleanup or other niceties.
- stdin piping with "-F -" appends a newline but stdin piping without
-F does not append a newline (inconsistent).
- git-commit does not specifically append a newline to the "-F"
input. The issue is somewhat muddled by the fact that git-commit
does pass the message through its --cleanup option, which may add
such a newline. But for commit-tree to match "commit --cleanup=verbatim",
we should not do so here.
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;
}
--
2.13.1.windows.2
next reply other threads:[~2017-09-07 14:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-07 14:41 Ross Kabus [this message]
2017-09-08 1:35 ` [PATCH] commit-tree: don't append a newline with -F Junio C Hamano
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=20170907144111.7488-1-rkabus@aerotech.com \
--to=rkabus@aerotech.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).