From: Brian Malehorn <bmalehorn@gmail.com>
To: git@vger.kernel.org
Cc: Brian Malehorn <bmalehorn@gmail.com>
Subject: [PATCH 3/3] commit.c: skip scissors when computing trailers
Date: Thu, 11 May 2017 22:03:47 -0700 [thread overview]
Message-ID: <20170512050347.30765-4-bmalehorn@gmail.com> (raw)
In-Reply-To: <20170512050347.30765-1-bmalehorn@gmail.com>
"scissors" ("----- >8 -----") can be automatically added to commit
messages by setting commit.verbose = true. Prevent this from interfering
with trailer calculations by automatically skipping over scissors,
instead of (usually) treating them as a comment.
---
commit.c | 13 +++++++++----
t/t7513-interpret-trailers.sh | 17 +++++++++++++++++
2 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/commit.c b/commit.c
index 041cfa5a9..9a7b41d09 100644
--- a/commit.c
+++ b/commit.c
@@ -1701,10 +1701,10 @@ int is_scissors_line(const char *line)
/*
* Inspect the given string and determine the true "end" of the log message, in
* order to find where to put a new Signed-off-by: line. Ignored are
- * trailing comment lines and blank lines, and also the traditional
- * "Conflicts:" block that is not commented out, so that we can use
- * "git commit -s --amend" on an existing commit that forgot to remove
- * it.
+ * trailing comment lines and blank lines. To support "git commit -s
+ * --amend" on an existing commit, we also ignore "Conflicts:". To
+ * support "git commit -v", we truncate at "---- >8 ----" and similar
+ * scissors lines.
*
* Returns the number of bytes from the tail to ignore, to be fed as
* the second parameter to append_signoff().
@@ -1723,6 +1723,11 @@ int ignore_non_trailer(const char *buf, size_t len)
else
next_line++;
+ if (is_scissors_line(&buf[bol])) {
+ if (!boc)
+ boc = bol;
+ break;
+ }
if (buf[bol] == comment_line_char || buf[bol] == '\n') {
/* is this the first of the run of comments? */
if (!boc)
diff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-trailers.sh
index 4dd1d7c52..d88d4a4ff 100755
--- a/t/t7513-interpret-trailers.sh
+++ b/t/t7513-interpret-trailers.sh
@@ -1258,4 +1258,21 @@ test_expect_success 'with no command and no key' '
test_cmp expected actual
'
+test_expect_success 'with scissors' '
+ cat >expected <<-EOF &&
+ my subject
+
+ review: Brian
+ sign: A U Thor <author@example.com>
+ # ------------------------ >8 ------------------------
+ ignore this
+ EOF
+ git interpret-trailers --trailer review:Brian >actual <<-EOF &&
+ my subject
+ # ------------------------ >8 ------------------------
+ ignore this
+ EOF
+ test_cmp expected actual
+'
+
test_done
--
2.12.3.3.g39c96af
next prev parent reply other threads:[~2017-05-12 5:04 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-12 5:03 [PATCH 0/3] interpret-trailers + commit -v bugfix Brian Malehorn
2017-05-12 5:03 ` [PATCH 1/3] mailinfo.c: is_scissors_line ends on newline Brian Malehorn
2017-05-12 8:31 ` Jeff King
2017-05-12 5:03 ` [PATCH 2/3] commit.c: add is_scissors_line Brian Malehorn
2017-05-12 8:40 ` Jeff King
2017-05-12 5:03 ` Brian Malehorn [this message]
2017-05-12 8:52 ` [PATCH 3/3] commit.c: skip scissors when computing trailers Jeff King
2017-05-12 9:00 ` [PATCH 0/3] interpret-trailers + commit -v bugfix Jeff King
2017-05-14 3:39 ` Brian Malehorn
2017-05-14 3:39 ` [PATCH] interpret-trailers: obey scissors lines Brian Malehorn
2017-05-14 3:56 ` Jeff King
2017-05-14 8:33 ` Brian Malehorn
2017-05-14 8:33 ` Brian Malehorn
2017-05-15 3:55 ` Junio C Hamano
2017-05-15 4:23 ` Junio C Hamano
2017-05-16 6:06 ` Brian Malehorn
2017-05-16 6:06 ` [PATCH] interpret-trailers: honor the cut line Brian Malehorn
2017-05-16 6:42 ` [PATCH] interpret-trailers: obey scissors lines Junio C Hamano
2017-05-15 3:08 ` Jeff King
2017-05-15 2:12 ` Junio C Hamano
2017-05-15 3:07 ` Jeff King
2017-05-15 3:32 ` Junio C Hamano
2017-05-15 3:33 ` Jeff King
2017-05-14 7:02 ` Ævar Arnfjörð Bjarmason
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=20170512050347.30765-4-bmalehorn@gmail.com \
--to=bmalehorn@gmail.com \
--cc=git@vger.kernel.org \
/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).