summaryrefslogtreecommitdiff
path: root/builtin/cat-file.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-04-22 13:42:49 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-04-22 13:42:49 -0700
commita768f866e9233b758cb21e25c7b8c985b0009c1f (patch)
tree1b411eb4c59a9e648a50c1dfe829d89418d0b30b /builtin/cat-file.c
parentMerge branch 'jm/gitweb-fastcgi-utf8' (diff)
parentoidset: stop referring to sha1-array (diff)
downloadtgif-a768f866e9233b758cb21e25c7b8c985b0009c1f.tar.xz
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 'builtin/cat-file.c')
-rw-r--r--builtin/cat-file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 6ecc8ee6dc..0d03fdac6e 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -12,7 +12,7 @@
#include "userdiff.h"
#include "streaming.h"
#include "tree-walk.h"
-#include "sha1-array.h"
+#include "oid-array.h"
#include "packfile.h"
#include "object-store.h"
#include "promisor-remote.h"