Browse Source

submodule: avoid hard-coded constants

Instead of using hard-coded 40-based constants, express these values in
terms of the_hash_algo and GIT_MAX_HEXSZ.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
brian m. carlson 6 years ago committed by Junio C Hamano
parent
commit
db1ba2a230
  1. 2
      merge-recursive.c
  2. 2
      submodule.c

2
merge-recursive.c

@ -1122,7 +1122,7 @@ static int find_first_merges(struct repository *repo, @@ -1122,7 +1122,7 @@ static int find_first_merges(struct repository *repo,
struct commit *commit;
int contains_another;

char merged_revision[42];
char merged_revision[GIT_MAX_HEXSZ + 2];
const char *rev_args[] = { "rev-list", "--merges", "--ancestry-path",
"--all", merged_revision, NULL };
struct rev_info revs;

2
submodule.c

@ -994,7 +994,7 @@ static int submodule_needs_pushing(struct repository *r, @@ -994,7 +994,7 @@ static int submodule_needs_pushing(struct repository *r,
if (start_command(&cp))
die("Could not run 'git rev-list <commits> --not --remotes -n 1' command in submodule %s",
path);
if (strbuf_read(&buf, cp.out, 41))
if (strbuf_read(&buf, cp.out, the_hash_algo->hexsz + 1))
needs_pushing = 1;
finish_command(&cp);
close(cp.out);

Loading…
Cancel
Save