diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-05-29 12:34:52 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-29 12:34:53 +0900 |
| commit | 965993d1ef59fe1667a0e32c213569be6a6535af (patch) | |
| tree | 6196e62d9e95924e8a4b224e3452046568cc227a /builtin | |
| parent | Merge branch 'tg/stash-push-fixup' (diff) | |
| parent | interpret-trailers: honor the cut line (diff) | |
| download | tgif-965993d1ef59fe1667a0e32c213569be6a6535af.tar.xz | |
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 'builtin')
| -rw-r--r-- | builtin/commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 1d191a49f8..da1ba4c862 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1739,7 +1739,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix) if (verbose || /* Truncate the message just before the diff, if any. */ cleanup_mode == CLEANUP_SCISSORS) - wt_status_truncate_message_at_cut_line(&sb); + strbuf_setlen(&sb, wt_status_locate_end(sb.buf, sb.len)); if (cleanup_mode != CLEANUP_NONE) strbuf_stripspace(&sb, cleanup_mode == CLEANUP_ALL); |