summaryrefslogtreecommitdiff
path: root/delta-islands.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2020-03-30 10:03:46 -0400
committerJunio C Hamano <gitster@pobox.com>2020-03-30 10:59:08 -0700
commitfe299ec5ae7b419990bbc3efd4e6bfa3f0773b45 (patch)
treecabe7f75d348ca4dac662a909d736ac53a94f4fa /delta-islands.c
parenteccce5253b9bfb17238f7d94c9ccf1cfd935eeb2 (diff)
downloadgit-fe299ec5ae7b419990bbc3efd4e6bfa3f0773b45.tar.gz
oid_array: rename source file from sha1-array
We renamed the actual data structure in 910650d2f8 (Rename sha1_array to oid_array, 2017-03-31), but the file is still called sha1-array. Besides being slightly confusing, it makes it more annoying to grep for leftover occurrences of "sha1" in various files, because the header is included in so many places. Let's complete the transition by renaming the source and header files (and fixing up a few comment references). I kept the "-" in the name, as that seems to be our style; cf. fc1395f4a4 (sha1_file.c: rename to use dash in file name, 2018-04-10). We also have oidmap.h and oidset.h without any punctuation, but those are "struct oidmap" and "struct oidset" in the code. We _could_ make this "oidarray" to match, but somehow it looks uglier to me because of the length of "array" (plus it would be a very invasive patch for little gain). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'delta-islands.c')
-rw-r--r--delta-islands.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/delta-islands.c b/delta-islands.c
index 09dbd3cf72..aa98b2e541 100644
--- a/delta-islands.c
+++ b/delta-islands.c
@@ -17,7 +17,7 @@
#include "pack-bitmap.h"
#include "pack-objects.h"
#include "delta-islands.h"
-#include "sha1-array.h"
+#include "oid-array.h"
#include "config.h"
KHASH_INIT(str, const char *, void *, 1, kh_str_hash_func, kh_str_hash_equal)