diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-06-26 19:29:49 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-06-26 19:29:49 +0300 |
| commit | 8d5c5a05d7abd67f8b667c888fe17783e1d676a5 (patch) | |
| tree | db512ef532bac47e2861f8b6ff680c2d72b58a93 /builtin/commit.c | |
| parent | 94486b6763c29144c60932829a65fec0597e17b3 (diff) | |
| parent | be3d65434323f7f00a5abed6dbcfe690cde648b8 (diff) | |
Merge branch 'jk/commit-use-no-divider-with-interpret-trailers'
When "git commit --trailer=..." invokes the interpret-trailers
machinery, it knows what it feeds to interpret-trailers is a full
log message without any patch, but failed to express that by
passing the "--no-divider" option, which has been corrected.
* jk/commit-use-no-divider-with-interpret-trailers:
commit: pass --no-divider to interpret-trailers
Diffstat (limited to 'builtin/commit.c')
| -rw-r--r-- | builtin/commit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 9ab57ea1aa..65a5c0e29d 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1043,7 +1043,8 @@ static int prepare_to_commit(const char *index_file, const char *prefix, struct child_process run_trailer = CHILD_PROCESS_INIT; strvec_pushl(&run_trailer.args, "interpret-trailers", - "--in-place", git_path_commit_editmsg(), NULL); + "--in-place", "--no-divider", + git_path_commit_editmsg(), NULL); strvec_pushv(&run_trailer.args, trailer_args.v); run_trailer.git_cmd = 1; if (run_command(&run_trailer)) |