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

Merge branch 'jk/maint-commit-v-strip'

Browse Source 
* jk/maint-commit-v-strip:
  commit: Fix stripping of patch in verbose mode.
This commit is contained in:
Junio C Hamano
2008-11-12 22:26:56 -08:00
parent 7b51b77dbc 0b38227f28
commit 6d14414d21
2 changed files with 78 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
builtin-commit.c
View File

@ -1015,9 +1015,11 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
}
/* Truncate the message just before the diff, if any. */
p = strstr(sb.buf, "\ndiff --git a/");
if (p != NULL)
strbuf_setlen(&sb, p - sb.buf + 1);
if (verbose) {
p = strstr(sb.buf, "\ndiff --git ");
if (p != NULL)
strbuf_setlen(&sb, p - sb.buf + 1);
}
if (cleanup_mode != CLEANUP_NONE)
stripspace(&sb, cleanup_mode == CLEANUP_ALL);