mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
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
This commit is contained in:
commit
8d5c5a05d7
|
@ -1043,7 +1043,8 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
|
||||||
struct child_process run_trailer = CHILD_PROCESS_INIT;
|
struct child_process run_trailer = CHILD_PROCESS_INIT;
|
||||||
|
|
||||||
strvec_pushl(&run_trailer.args, "interpret-trailers",
|
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);
|
strvec_pushv(&run_trailer.args, trailer_args.v);
|
||||||
run_trailer.git_cmd = 1;
|
run_trailer.git_cmd = 1;
|
||||||
if (run_command(&run_trailer))
|
if (run_command(&run_trailer))
|
||||||
|
|
|
@ -466,6 +466,25 @@ test_expect_success 'commit --trailer with -c and command' '
|
||||||
test_cmp expected actual
|
test_cmp expected actual
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success 'commit --trailer not confused by --- separator' '
|
||||||
|
cat >msg <<-\EOF &&
|
||||||
|
subject
|
||||||
|
|
||||||
|
body with dashes
|
||||||
|
---
|
||||||
|
in it
|
||||||
|
EOF
|
||||||
|
git commit --allow-empty --trailer="my-trailer: value" -F msg &&
|
||||||
|
{
|
||||||
|
cat msg &&
|
||||||
|
echo &&
|
||||||
|
echo "my-trailer: value"
|
||||||
|
} >expected &&
|
||||||
|
git cat-file commit HEAD >commit.msg &&
|
||||||
|
sed -e "1,/^\$/d" commit.msg >actual &&
|
||||||
|
test_cmp expected actual
|
||||||
|
'
|
||||||
|
|
||||||
test_expect_success 'multiple -m' '
|
test_expect_success 'multiple -m' '
|
||||||
|
|
||||||
>negative &&
|
>negative &&
|
||||||
|
|
Loading…
Reference in a new issue