summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorChristian Couder <chriscool@tuxfamily.org>2010-07-22 13:18:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-07-23 23:09:28 (GMT)
commit11af2aaed657d10dea083f5d5cb7f93bb96a7b70 (patch)
tree84a62e4309c818a2c600ea06f4d99db983f40a71 /builtin
parent2c048a3038fd4d94e150fbc1dfd2242325ca7db6 (diff)
downloadgit-11af2aaed657d10dea083f5d5cb7f93bb96a7b70.zip
git-11af2aaed657d10dea083f5d5cb7f93bb96a7b70.tar.gz
git-11af2aaed657d10dea083f5d5cb7f93bb96a7b70.tar.bz2
revert: refactor code to find commit subject in find_commit_subject()
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/revert.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/builtin/revert.c b/builtin/revert.c
index c170715..d477944 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -98,7 +98,7 @@ struct commit_message {
static int get_message(const char *raw_message, struct commit_message *out)
{
const char *encoding;
- const char *p, *abbrev, *eol;
+ const char *p, *abbrev;
char *q;
int abbrev_len, oneline_len;
@@ -121,17 +121,7 @@ static int get_message(const char *raw_message, struct commit_message *out)
abbrev = find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV);
abbrev_len = strlen(abbrev);
- /* Find beginning and end of commit subject. */
- p = out->message;
- while (*p && (*p != '\n' || p[1] != '\n'))
- p++;
- if (*p) {
- p += 2;
- for (eol = p; *eol && *eol != '\n'; eol++)
- ; /* do nothing */
- } else
- eol = p;
- oneline_len = eol - p;
+ oneline_len = find_commit_subject(out->message, &p);
out->parent_label = xmalloc(strlen("parent of ") + abbrev_len +
strlen("... ") + oneline_len + 1);