mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revision: replace use of hard-coded constants

Browse Source 
Replace two uses of the hard-coded constant 40 with references to
the_hash_algo.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson
2018-05-02 00:25:50 +00:00
committed by Junio C Hamano
parent dd724bcb2f
commit fd521245e6
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
revision.c
View File

@ -1751,6 +1751,7 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
const char *arg = argv[0]; const char *arg = argv[0];
const char *optarg; const char *optarg;
int argcount; int argcount;
const unsigned hexsz = the_hash_algo->hexsz;
/* pseudo revision arguments */ /* pseudo revision arguments */
if (!strcmp(arg, "--all") || !strcmp(arg, "--branches") || if (!strcmp(arg, "--all") || !strcmp(arg, "--branches") ||
@ -2038,8 +2039,8 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
revs->abbrev = strtoul(optarg, NULL, 10); revs->abbrev = strtoul(optarg, NULL, 10);
if (revs->abbrev < MINIMUM_ABBREV) if (revs->abbrev < MINIMUM_ABBREV)
revs->abbrev = MINIMUM_ABBREV; revs->abbrev = MINIMUM_ABBREV;
else if (revs->abbrev > 40) else if (revs->abbrev > hexsz)
revs->abbrev = 40; revs->abbrev = hexsz;
} else if (!strcmp(arg, "--abbrev-commit")) { } else if (!strcmp(arg, "--abbrev-commit")) {
revs->abbrev_commit = 1; revs->abbrev_commit = 1;
revs->abbrev_commit_given = 1; revs->abbrev_commit_given = 1;