From: Jonathan Nieder <jrnieder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>,
Eli Barzilay <eli@barzilay.org>,
git@vger.kernel.org, Will Palmer <wmpalmer@gmail.com>
Subject: [PATCH 2/3] checkout, commit: remove confusing assignments to rev.abbrev
Date: Tue, 27 Jul 2010 13:37:07 -0500 [thread overview]
Message-ID: <20100727183706.GD5578@burratino> (raw)
In-Reply-To: <20100727182942.GB5578@burratino>
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>
---
builtin/checkout.c | 1 -
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 a78dbd8..279cfc1 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;
--
1.7.2.21.g04ff
next prev parent reply other threads:[~2010-07-27 18:38 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-25 9:08 Possible bug with `export-subst' attribute Eli Barzilay
2010-07-25 13:09 ` Ilari Liusvaara
2010-07-25 22:15 ` Jonathan Nieder
2010-07-25 22:41 ` Eli Barzilay
2010-07-26 6:01 ` Junio C Hamano
2010-07-26 19:04 ` Jonathan Nieder
2010-07-27 17:35 ` Junio C Hamano
2010-07-27 18:29 ` [PATCH 0/3] archive: abbreviate substituted commit ids again Jonathan Nieder
2010-07-27 18:32 ` [PATCH 1/3] " Jonathan Nieder
2010-07-27 18:37 ` Jonathan Nieder [this message]
2010-07-27 20:18 ` [PATCH 2/3] checkout, commit: remove confusing assignments to rev.abbrev Will Palmer
2010-07-27 21:09 ` Jonathan Nieder
2010-07-28 10:01 ` Will Palmer
2010-07-28 17:23 ` Junio C Hamano
2010-07-27 18:44 ` [PATCH 3/3] examples/commit: use --abbrev for commit summary Jonathan Nieder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100727183706.GD5578@burratino \
--to=jrnieder@gmail.com \
--cc=eli@barzilay.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ilari.liusvaara@elisanet.fi \
--cc=wmpalmer@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).