зеркало из https://github.com/microsoft/git.git
builtin/merge-recursive: make hash independent
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
ab47df2d9a
Коммит
b7f20f7204
|
@ -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);
|
||||
|
|
Загрузка…
Ссылка в новой задаче