summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-28 11:25:50 -0700
committerJunio C Hamano <gitster@pobox.com>2016-07-28 11:25:50 -0700
commit4966b58f3e1f295e3fb22560006b1db717b56f37 (patch)
treeaf3813c17a7bc43822bd9d7b0b6ca008eeff8789 /commit.c
parent053e2fb5798374d1628b8cd4d797a64e48c944b6 (diff)
parent054a5aee6f3e8e90d96f7b3f76f5f55752561c59 (diff)
downloadgit-4966b58f3e1f295e3fb22560006b1db717b56f37.tar.gz
Merge branch 'js/find-commit-subject-ignore-leading-blanks' into maint
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 'commit.c')
-rw-r--r--commit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/commit.c b/commit.c
index 3f4f371e5e..24d4715f24 100644
--- a/commit.c
+++ b/commit.c
@@ -414,7 +414,7 @@ int find_commit_subject(const char *commit_buffer, const char **subject)
while (*p && (*p != '\n' || p[1] != '\n'))
p++;
if (*p) {
- p += 2;
+ p = skip_blank_lines(p + 2);
for (eol = p; *eol && *eol != '\n'; eol++)
; /* do nothing */
} else