diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2010-07-27 13:37:07 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-07-27 13:29:14 -0700 |
| commit | dcbeac48a7e61154c53ae800ea224607c1f7d52a (patch) | |
| tree | 072ff21a159f6b43ac2a5d1bf12be53614383ff0 | |
| parent | archive: abbreviate substituted commit ids again (diff) | |
| download | tgif-dcbeac48a7e61154c53ae800ea224607c1f7d52a.tar.xz | |
checkout, commit: remove confusing assignments to rev.abbrev
Since they do not precede setup_revisions, these assignments of 0 to
rev.abbrev have no effect.
v1.7.1.1~17^2~3 (2010-05-03) taught the log --format=%h machinery
to respect --abbrev instead of always abbreviating, so we have to pay
attention to the abbrev setting now.
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 1994be92c6..eef2b48d98 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 a78dbd83bf..279cfc1b5d 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; |