summaryrefslogtreecommitdiff
path: root/builtin/reset.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-11 17:31:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-07-11 17:31:08 (GMT)
commit62e5e83f8dfc98e182a1ca3a48b2c69f4fd417ce (patch)
treef25182845eb0c18d21f5454f34cfe0d0c1c540f4 /builtin/reset.c
parent493ddea54d32cea8e99029a21d16cfdd164d31fd (diff)
parent054a5aee6f3e8e90d96f7b3f76f5f55752561c59 (diff)
downloadgit-62e5e83f8dfc98e182a1ca3a48b2c69f4fd417ce.zip
git-62e5e83f8dfc98e182a1ca3a48b2c69f4fd417ce.tar.gz
git-62e5e83f8dfc98e182a1ca3a48b2c69f4fd417ce.tar.bz2
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 'builtin/reset.c')
-rw-r--r--builtin/reset.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/reset.c b/builtin/reset.c
index acd6278..5c6206b 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -103,7 +103,7 @@ static void print_new_head_line(struct commit *commit)
if (body) {
const char *eol;
size_t len;
- body += 2;
+ body = skip_blank_lines(body + 2);
eol = strchr(body, '\n');
len = eol ? eol - body : strlen(body);
printf(" %.*s\n", (int) len, body);