From: Namhyung Kim Date: Mon, 07 Mar 2011 04:35:40 GMT Subject: [PATCH] blame: honor core.abbrevguard Message-ID: <1299472540-6066-1-git-send-email-namhyung@gmail.com> Commit 72a5b561 ("core.abbrevguard: Ensure short object names stay unique a bit longer") introduced this config variable to make object name unambiguously. Use it. Signed-off-by: Namhyung Kim --- builtin/blame.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/builtin/blame.c b/builtin/blame.c index aa30ec52692..d1cf22beba1 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -1664,14 +1664,22 @@ static void emit_other(struct scoreboard *sb, struct blame_entry *ent, int opt) struct commit_info ci; char hex[41]; int show_raw_time = !!(opt & OUTPUT_RAW_TIMESTAMP); + int length; get_commit_info(suspect->commit, &ci, 1); strcpy(hex, sha1_to_hex(suspect->commit->object.sha1)); + if (opt & OUTPUT_LONG_OBJECT_NAME) + length = 40; + else { + length = 8 + unique_abbrev_extra_length; + if (length > 40) + length = 40; + } + cp = nth_line(sb, ent->lno); for (cnt = 0; cnt < ent->num_lines; cnt++) { char ch; - int length = (opt & OUTPUT_LONG_OBJECT_NAME) ? 40 : 8; if (suspect->commit->object.flags & UNINTERESTING) { if (blank_boundary) -- 1.7.4