diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-20 19:53:09 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-20 19:53:09 (GMT) |
| commit | 316fa401e1c953ffc80533aaf6839817595cdd77 (patch) | |
| tree | 6ad48c40abadde6c9c7d44a9d03246da65f94f25 /builtin | |
| parent | 7d61b31b67a470c7008a989901d3efa1e6533dbe (diff) | |
| parent | 7f1592db5d4cba2b3de3a1ce46eb8c05bd33e0a1 (diff) | |
| download | git-316fa401e1c953ffc80533aaf6839817595cdd77.zip git-316fa401e1c953ffc80533aaf6839817595cdd77.tar.gz git-316fa401e1c953ffc80533aaf6839817595cdd77.tar.bz2 | |
Merge branch 'jn/fix-abbrev' into maint
* jn/fix-abbrev:
examples/commit: use --abbrev for commit summary
checkout, commit: remove confusing assignments to rev.abbrev
archive: abbreviate substituted commit ids again
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/checkout.c | 1 | ||||
| -rw-r--r-- | builtin/commit.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 1994be9..eef2b48 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -279,7 +279,6 @@ static void show_local_changes(struct object *head) struct rev_info rev; /* I think we want full paths, even if we're in a subdirectory. */ init_revisions(&rev, NULL); - rev.abbrev = 0; rev.diffopt.output_format |= DIFF_FORMAT_NAME_STATUS; if (diff_setup_done(&rev.diffopt) < 0) die("diff_setup_done failed"); diff --git a/builtin/commit.c b/builtin/commit.c index 2bb30c0..c4a577d 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1163,7 +1163,6 @@ static void print_summary(const char *prefix, const unsigned char *sha1) init_revisions(&rev, prefix); setup_revisions(0, NULL, &rev, NULL); - rev.abbrev = 0; rev.diff = 1; rev.diffopt.output_format = DIFF_FORMAT_SHORTSTAT | DIFF_FORMAT_SUMMARY; |