diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-04-22 13:42:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-22 13:42:49 -0700 |
| commit | a768f866e9233b758cb21e25c7b8c985b0009c1f (patch) | |
| tree | 1b411eb4c59a9e648a50c1dfe829d89418d0b30b /combine-diff.c | |
| parent | 7a8bb6db7cc04add05484c4fc907e34f76b12fb9 (diff) | |
| parent | 0740d0a5d3046e28b8d49baafafe521c5fc81711 (diff) | |
| download | git-a768f866e9233b758cb21e25c7b8c985b0009c1f.tar.gz | |
Merge branch 'jk/oid-array-cleanups'
Code cleanup.
* jk/oid-array-cleanups:
oidset: stop referring to sha1-array
ref-filter: stop referring to "sha1 array"
bisect: stop referring to sha1_array
test-tool: rename sha1-array to oid-array
oid_array: rename source file from sha1-array
oid_array: use size_t for iteration
oid_array: use size_t for count and allocation
Diffstat (limited to 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/combine-diff.c b/combine-diff.c index d5c4d839dc..002e0e5438 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -10,7 +10,7 @@ #include "log-tree.h" #include "refs.h" #include "userdiff.h" -#include "sha1-array.h" +#include "oid-array.h" #include "revision.h" static int compare_paths(const struct combine_diff_path *one, |