From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 23 Apr 2010 05:39:26 +0000 (-0700)
Subject: Merge branch 'mg/use-default-abbrev-length-in-rev-list' into maint
X-Git-Tag: v1.7.0.6~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5deb15e47e1e14ded0c586da4bff88e33d11f301?ds=inline;hp=-c

Merge branch 'mg/use-default-abbrev-length-in-rev-list' into maint

* mg/use-default-abbrev-length-in-rev-list:
rev-list: use default abbrev length when abbrev-commit is in effect
---

5deb15e47e1e14ded0c586da4bff88e33d11f301
diff --combined builtin-rev-list.c
index 1db4b4ccc6,eb8e2c2056..51ceb19d88
--- a/builtin-rev-list.c
+++ b/builtin-rev-list.c
@@@ -133,12 -133,9 +133,12 @@@ static void show_commit(struct commit *
  				 */
  				if (graph_show_remainder(revs->graph))
  					putchar('\n');
 +				if (revs->commit_format == CMIT_FMT_ONELINE)
 +					putchar('\n');
  			}
  		} else {
 -			if (buf.len)
 +			if (revs->commit_format != CMIT_FMT_USERFORMAT ||
 +			    buf.len)
  				printf("%s%c", buf.buf, info->hdr_termination);
  		}
  		strbuf_release(&buf);
@@@ -316,7 -313,7 +316,7 @@@ int cmd_rev_list(int argc, const char *
  
  	git_config(git_default_config, NULL);
  	init_revisions(&revs, prefix);
- 	revs.abbrev = 0;
+ 	revs.abbrev = DEFAULT_ABBREV;
  	revs.commit_format = CMIT_FMT_UNSPECIFIED;
  	argc = setup_revisions(argc, argv, &revs, NULL);