diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-12-10 01:22:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-10 01:22:42 -0800 |
| commit | 7be2b6e02b4f2a1b4812764f65b12cafb11a934e (patch) | |
| tree | c94ad7eb3a4d478a1c71eb6ef0aaf1c0f7348660 /builtin-log.c | |
| parent | Documentation: describe -w/--web option to "git-help". (diff) | |
| parent | Update draft Release Notes for 1.5.4 (diff) | |
| download | git-7be2b6e02b4f2a1b4812764f65b12cafb11a934e.tar.gz git-7be2b6e02b4f2a1b4812764f65b12cafb11a934e.zip | |
Merge branch 'master' into cc/help
This is to primarily pull in MANPATH tweak and help.txt formatting fix
from the master branch.
Diffstat (limited to 'builtin-log.c')
| -rw-r--r-- | builtin-log.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-log.c b/builtin-log.c index e1f1cf6714..b6a11220e2 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -557,7 +557,7 @@ static void get_patch_ids(struct rev_info *rev, struct patch_ids *ids, const cha static void gen_message_id(char *dest, unsigned int length, char *base) { - const char *committer = git_committer_info(-1); + const char *committer = git_committer_info(IDENT_WARN_ON_NO_NAME); const char *email_start = strrchr(committer, '<'); const char *email_end = strrchr(committer, '>'); if(!email_start || !email_end || email_start > email_end - 1) @@ -665,7 +665,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) !strcmp(argv[i], "-s")) { const char *committer; const char *endpos; - committer = git_committer_info(1); + committer = git_committer_info(IDENT_ERROR_ON_NO_NAME); endpos = strchr(committer, '>'); if (!endpos) die("bogos committer info %s\n", committer); |