From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 13 Dec 2007 01:07:03 +0000 (-0800)
Subject: Merge branch 'jc/shortlog-e'
X-Git-Tag: v1.5.4-rc0~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cd1bea918bde5b32cf29159acac067bd238825b3?ds=inline;hp=-c

Merge branch 'jc/shortlog-e'

* jc/shortlog-e:
shortlog: default to HEAD when the standard input is a tty
Invert numbers and names in the git-shortlog summary mode.
shortlog: document -e option
git-shortlog -e: show e-mail address as well
---

cd1bea918bde5b32cf29159acac067bd238825b3
diff --combined builtin-log.c
index b6a11220e2,d375c9dbf9..cc3cc9069a
--- a/builtin-log.c
+++ b/builtin-log.c
@@@ -18,9 -18,6 +18,6 @@@
  static int default_show_root = 1;
  static const char *fmt_patch_subject_prefix = "PATCH";
  
- /* this is in builtin-diff.c */
- void add_head(struct rev_info *revs);
- 
  static void add_name_decoration(const char *prefix, const char *name, struct object *obj)
  {
  	int plen = strlen(prefix);
@@@ -557,7 -554,7 +554,7 @@@ static void get_patch_ids(struct rev_in
  
  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 -662,7 +662,7 @@@ int cmd_format_patch(int argc, const ch
  			 !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);
@@@ -746,7 -743,7 +743,7 @@@
  			 * does not have.
  			 */
  			rev.pending.objects[0].item->flags |= UNINTERESTING;
- 			add_head(&rev);
+ 			add_head_to_pending(&rev);
  		}
  		/*
  		 * Otherwise, it is "format-patch -22 HEAD", and/or