diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-04-25 07:41:17 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-04-25 07:41:17 (GMT) |
commit | d4e568b2a31d7b2fe45dac9165bb077b570fc96a (patch) | |
tree | bff4affbf3e8c472cb914238eef19820d1ac4872 /merge-recursive.c | |
parent | dae82ecf147c58c6862d349fb8421d81f5868616 (diff) | |
parent | cfb049119c9e8b8f66a2e1faf1621ac48f714412 (diff) | |
download | git-d4e568b2a31d7b2fe45dac9165bb077b570fc96a.zip git-d4e568b2a31d7b2fe45dac9165bb077b570fc96a.tar.gz git-d4e568b2a31d7b2fe45dac9165bb077b570fc96a.tar.bz2 |
Merge branch 'bc/hash-transition-16'
Conversion from unsigned char[20] to struct object_id continues.
* bc/hash-transition-16: (35 commits)
gitweb: make hash size independent
Git.pm: make hash size independent
read-cache: read data in a hash-independent way
dir: make untracked cache extension hash size independent
builtin/difftool: use parse_oid_hex
refspec: make hash size independent
archive: convert struct archiver_args to object_id
builtin/get-tar-commit-id: make hash size independent
get-tar-commit-id: parse comment record
hash: add a function to lookup hash algorithm by length
remote-curl: make hash size independent
http: replace sha1_to_hex
http: compute hash of downloaded objects using the_hash_algo
http: replace hard-coded constant with the_hash_algo
http-walker: replace sha1_to_hex
http-push: remove remaining uses of sha1_to_hex
http-backend: allow 64-character hex names
http-push: convert to use the_hash_algo
builtin/pull: make hash-size independent
builtin/am: make hash size independent
...
Diffstat (limited to 'merge-recursive.c')
-rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 6c40c61..6126773 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -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; |