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

Merge branch 'maint-1.5.4' into maint

Browse Source 
* maint-1.5.4:
  git-bisect: make "start", "good" and "skip" succeed or fail atomically
  git-am: cope better with an empty Subject: line
  Ignore leading empty lines while summarizing merges
  bisect: squelch "fatal: ref HEAD not a symref" misleading message
  builtin-apply: Show a more descriptive error on failure when opening a patch
  Clarify documentation of git-cvsserver, particularly in relation to git-shell
This commit is contained in:
Junio C Hamano
2008-04-16 00:37:33 -07:00
parent 2b6f0b0a78 d3e54c8829
commit 464509f790
6 changed files with 54 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
builtin-fmt-merge-msg.c
View File

@ -201,6 +201,15 @@ static void shortlog(const char *name, unsigned char *sha1,
continue;
bol = strstr(commit->buffer, "\n\n");
if (bol) {
unsigned char c;
do {
c = *++bol;
} while (isspace(c));
if (!c)
bol = NULL;
}
if (!bol) {
append_to_list(&subjects, xstrdup(sha1_to_hex(
commit->object.sha1)),
@ -208,7 +217,6 @@ static void shortlog(const char *name, unsigned char *sha1,
continue;
}
bol += 2;
eol = strchr(bol, '\n');
if (eol) {
oneline = xmemdupz(bol, eol - bol);