[PATCH 2/2] blame: honor core.abbrev
- From
Namhyung Kim <namhyung@gmail.com>
- Date
- Apr 1, 2011, 01:54 UTC
- Message-ID
- <1301622896-5836-2-git-send-email-namhyung@gmail.com>
- In-Reply-To
- <1301622896-5836-1-git-send-email-namhyung@gmail.com>
If user sets config.abbrev option, use it as if --abbrev was given. We can't set abbrev to default_abbrev unconditionally IMHO, because historically default abbrev length of the blame command is 8 and DEFAULT_ABBREV is 7.
As you may see, this is the default value and user can use different abbrev length by specifing --abbrev=N command line option.
Signed-off-by: Namhyung Kim <namhyung@gmail.com> --- builtin/blame.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/builtin/blame.c b/builtin/blame.c index 253b480..93693d2 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -2317,12 +2317,16 @@ int cmd_blame(int argc, const char **argv, const char *prefix) struct parse_opt_ctx_t ctx; int cmd_is_annotate = !strcmp(argv[0], "annotate"); + int orig_abbrev = DEFAULT_ABBREV; git_config(git_blame_config, NULL); init_revisions(&revs, NULL); revs.date_mode = blame_date_mode; DIFF_OPT_SET(&revs.diffopt, ALLOW_TEXTCONV); + /* if user sets config.abbrev, honor it */ + if (orig_abbrev != default_abbrev) + abbrev = default_abbrev; save_commit_buffer = 0; dashdash_pos = 0;
-- 1.7.4