Merge branch 'mg/use-default-abbrev-length-in-rev-list' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 23 Apr 2010 05:39:26 +0000 (22:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 23 Apr 2010 05:39:26 +0000 (22:39 -0700)
* mg/use-default-abbrev-length-in-rev-list:
rev-list: use default abbrev length when abbrev-commit is in effect

1  2 
builtin-rev-list.c
diff --combined builtin-rev-list.c
index 1db4b4ccc628d43055c5604c73174a84788827f1,eb8e2c2056271345e42003ad5e51d775f8e07177..51ceb19d88918445c90eccc37f1fe5f90cedd385
@@@ -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);