[PATCH v2 22/42] revision: replace use of hard-coded constants
- From
brian m. carlson <sandals@crustytoothpaste.net>
- Date
- May 2, 2018, 00:25 UTC
- Message-ID
- <20180502002610.915892-23-sandals@crustytoothpaste.net>
- In-Reply-To
- <20180502002610.915892-1-sandals@crustytoothpaste.net>
Replace two uses of the hard-coded constant 40 with references to the_hash_algo.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> --- revision.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/revision.c b/revision.c index ce0e7b71f2..daf7fe6ff4 100644 --- a/revision.c +++ b/revision.c @@ -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 *optarg; int argcount; + const unsigned hexsz = the_hash_algo->hexsz; /* pseudo revision arguments */ 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); if (revs->abbrev < MINIMUM_ABBREV) revs->abbrev = MINIMUM_ABBREV; - else if (revs->abbrev > 40) - revs->abbrev = 40; + else if (revs->abbrev > hexsz) + revs->abbrev = hexsz; } else if (!strcmp(arg, "--abbrev-commit")) { revs->abbrev_commit = 1; revs->abbrev_commit_given = 1;