diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-11 10:31:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-11 10:31:08 -0700 |
| commit | 62e5e83f8dfc98e182a1ca3a48b2c69f4fd417ce (patch) | |
| tree | f25182845eb0c18d21f5454f34cfe0d0c1c540f4 /sequencer.c | |
| parent | 493ddea54d32cea8e99029a21d16cfdd164d31fd (diff) | |
| parent | 054a5aee6f3e8e90d96f7b3f76f5f55752561c59 (diff) | |
| download | git-62e5e83f8dfc98e182a1ca3a48b2c69f4fd417ce.tar.gz | |
Merge branch 'js/find-commit-subject-ignore-leading-blanks'
A helper function that takes the contents of a commit object and
finds its subject line did not ignore leading blank lines, as is
commonly done by other codepaths. Make it ignore leading blank
lines to match.
* js/find-commit-subject-ignore-leading-blanks:
reset --hard: skip blank lines when reporting the commit subject
sequencer: use skip_blank_lines() to find the commit subject
commit -C: skip blank lines at the beginning of the message
commit.c: make find_commit_subject() more robust
pretty: make the skip_blank_lines() function public
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sequencer.c b/sequencer.c index c6362d63f3..a33c39b64f 100644 --- a/sequencer.c +++ b/sequencer.c @@ -544,10 +544,8 @@ static int do_pick_commit(struct commit *commit, struct replay_opts *opts) * information followed by "\n\n". */ p = strstr(msg.message, "\n\n"); - if (p) { - p += 2; - strbuf_addstr(&msgbuf, p); - } + if (p) + strbuf_addstr(&msgbuf, skip_blank_lines(p + 2)); if (opts->record_origin) { if (!has_conforming_footer(&msgbuf, NULL, 0)) |