[PATCH v2 12/16] builtin/merge-recursive: make hash independent
- From
brian m. carlson <sandals@crustytoothpaste.net>
- Date
- Jul 16, 2018, 01:28 UTC
- Message-ID
- <20180716012808.961328-13-sandals@crustytoothpaste.net>
- In-Reply-To
- <20180716012808.961328-1-sandals@crustytoothpaste.net>
Use GIT_MAX_HEXSZ instead of GIT_SHA1_HEXSZ for an allocation so that it is sufficiently large. Switch a comparison to use the_hash_algo to determine the length of a hex object ID.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> --- builtin/merge-recursive.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c index 0dd9021958..9b2f707c29 100644 --- a/builtin/merge-recursive.c +++ b/builtin/merge-recursive.c @@ -9,10 +9,10 @@ static const char builtin_merge_recursive_usage[] = static const char *better_branch_name(const char *branch) { - static char githead_env[8 + GIT_SHA1_HEXSZ + 1]; + static char githead_env[8 + GIT_MAX_HEXSZ + 1]; char *name; - if (strlen(branch) != GIT_SHA1_HEXSZ) + if (strlen(branch) != the_hash_algo->hexsz) return branch; xsnprintf(githead_env, sizeof(githead_env), "GITHEAD_%s", branch); name = getenv(githead_env);