mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'cc/find-commit-subject'

Browse Source 
* cc/find-commit-subject:
  blame: use find_commit_subject() instead of custom code
  merge-recursive: use find_commit_subject() instead of custom code
  bisect: use find_commit_subject() instead of custom code
  revert: rename variables related to subject in get_message()
  revert: refactor code to find commit subject in find_commit_subject()
  revert: fix off by one read when searching the end of a commit subject
This commit is contained in:
Junio C Hamano
2010-08-18 12:46:55 -07:00
parent 29e1353a7d ad98a58b3d
commit 165dc789d5
7 changed files with 62 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
merge-recursive.c
View File

@ -136,16 +136,10 @@ static void output_commit_title(struct merge_options *o, struct commit *commit)
if (parse_commit(commit) != 0)
printf("(bad commit)\n");
else {
const char *s;
int len;
for (s = commit->buffer; *s; s++)
if (*s == '\n' && s[1] == '\n') {
s += 2;
break;
}
for (len = 0; s[len] && '\n' != s[len]; len++)
; /* do nothing */
printf("%.*s\n", len, s);
const char *title;
int len = find_commit_subject(commit->buffer, &title);
if (len)
printf("%.*s\n", len, title);
}
}
}