path: root/t
diff options
authorBrian Malehorn <>2017-05-16 06:06:49 (GMT)
committerJunio C Hamano <>2017-05-18 06:00:48 (GMT)
commitd76650b8d16c9e5e7b6ee94e6922a3b99be74746 (patch)
tree45621bb22a57f6636fd6cd62526991f91e255e12 /t
parentb06d3643105c8758ed019125a4399cb7efdcce2c (diff)
interpret-trailers: honor the cut line
If a commit message is edited with the "verbose" option, the buffer will have a cut line and diff after the log message, like so: my subject # ------------------------ >8 ------------------------ # Do not touch the line above. # Everything below will be removed. diff --git a/foo.txt b/foo.txt index 5716ca5..7601807 100644 --- a/foo.txt +++ b/foo.txt @@ -1 +1 @@ -bar +baz "git interpret-trailers" is unaware of the cut line, and assumes the trailer block would be at the end of the whole thing. This can easily be seen with: $ GIT_EDITOR='git interpret-trailers --in-place --trailer Acked-by:me' \ git commit --amend -v Teach "git interpret-trailers" to notice the cut-line and ignore the remainder of the input when looking for a place to add new trailer block. This makes it consistent with how "git commit -v -s" inserts a new Signed-off-by: line. This can be done by the same logic as the existing helper function, wt_status_truncate_message_at_cut_line(), uses, but it wants the caller to pass a strbuf to it. Because the function ignore_non_trailer() used by the command takes a <pointer, length> pair, not a strbuf, steal the logic from wt_status_truncate_message_at_cut_line() to create a new wt_status_locate_end() helper function that takes <pointer, length> pair, and make ignore_non_trailer() call it to help "interpret-trailers". Since there is only one caller of wt_status_truncate_message_at_cut_line() in cmd_commit(), rewrite it to call wt_status_locate_end() helper instead and remove the old helper that no longer has any caller. Signed-off-by: Brian Malehorn <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 't')
1 files changed, 17 insertions, 0 deletions
diff --git a/t/ b/t/
index 4dd1d7c..0c6f91c 100755
--- a/t/
+++ b/t/
@@ -1258,4 +1258,21 @@ test_expect_success 'with no command and no key' '
test_cmp expected actual
+test_expect_success 'with cut line' '
+ cat >expected <<-\EOF &&
+ my subject
+ review: Brian
+ sign: A U Thor <>
+ # ------------------------ >8 ------------------------
+ ignore this
+ git interpret-trailers --trailer review:Brian >actual <<-\EOF &&
+ my subject
+ # ------------------------ >8 ------------------------
+ ignore this
+ test_cmp expected actual