diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-05-29 06:34:52 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-29 06:34:53 +0300 |
| commit | 965993d1ef59fe1667a0e32c213569be6a6535af (patch) | |
| tree | 6196e62d9e95924e8a4b224e3452046568cc227a /t | |
| parent | 6f7f11f7aa7b95c1555cd389a219f76ee30b5cc7 (diff) | |
| parent | d76650b8d16c9e5e7b6ee94e6922a3b99be74746 (diff) | |
Merge branch 'bm/interpret-trailers-cut-line-is-eom'
"git interpret-trailers", when used as GIT_EDITOR for "git commit
-v", looked for and appended to a trailer block at the very end,
i.e. at the end of the "diff" output. The command has been
corrected to pay attention to the cut-mark line "commit -v" adds to
the buffer---the real trailer block should appear just before it.
* bm/interpret-trailers-cut-line-is-eom:
interpret-trailers: honor the cut line
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7513-interpret-trailers.sh | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-trailers.sh index 4dd1d7c520..0c6f91c433 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 cut line' ' + 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 |