summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-01-25 09:03:18 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-01-28 08:09:38 (GMT)
commit46a6c2620ba421397eec627b8eb18eb530e694fc (patch)
tree9222e809b0d77ad10e7304073d4c053c7edd9266 /diff.c
parent6b94f1e404afc552e5139c4357331843f5be61ad (diff)
downloadgit-46a6c2620ba421397eec627b8eb18eb530e694fc.zip
git-46a6c2620ba421397eec627b8eb18eb530e694fc.tar.gz
git-46a6c2620ba421397eec627b8eb18eb530e694fc.tar.bz2
abbrev cleanup: use symbolic constants
The minimum length of abbreviated object name was hardcoded in different places to be 4, risking inconsistencies in the future. Also there were three different "default abbreviation precision". Use two C preprocessor symbols to clean up this mess. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/diff.c b/diff.c
index 17d68fa..69767b9 100644
--- a/diff.c
+++ b/diff.c
@@ -723,7 +723,7 @@ static void run_diff(struct diff_filepair *p, struct diff_options *o)
if (memcmp(one->sha1, two->sha1, 20)) {
char one_sha1[41];
- int abbrev = o->full_index ? 40 : DIFF_DEFAULT_INDEX_ABBREV;
+ int abbrev = o->full_index ? 40 : DEFAULT_ABBREV;
memcpy(one_sha1, sha1_to_hex(one->sha1), 41);
len += snprintf(msg + len, sizeof(msg) - len,
@@ -846,7 +846,7 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
else if (!strcmp(arg, "--find-copies-harder"))
options->find_copies_harder = 1;
else if (!strcmp(arg, "--abbrev"))
- options->abbrev = DIFF_DEFAULT_ABBREV;
+ options->abbrev = DEFAULT_ABBREV;
else if (!strncmp(arg, "--abbrev=", 9))
options->abbrev = strtoul(arg + 9, NULL, 10);
else