Skip to content

Commit fe299ec

Browse files
peffgitster
peff
authored and
gitster
committed
oid_array: rename source file from sha1-array
We renamed the actual data structure in 910650d (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. fc1395f (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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent eccce52 commit fe299ec

27 files changed

Lines changed: 28 additions & 28 deletions

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -929,6 +929,7 @@ LIB_OBJS += notes-utils.o
929929
LIB_OBJS += object.o
930930
LIB_OBJS += oidmap.o
931931
LIB_OBJS += oidset.o
932+
LIB_OBJS += oid-array.o
932933
LIB_OBJS += packfile.o
933934
LIB_OBJS += pack-bitmap.o
934935
LIB_OBJS += pack-bitmap-write.o
@@ -978,7 +979,6 @@ LIB_OBJS += sequencer.o
978979
LIB_OBJS += serve.o
979980
LIB_OBJS += server-info.o
980981
LIB_OBJS += setup.o
981-
LIB_OBJS += sha1-array.o
982982
LIB_OBJS += sha1-lookup.o
983983
LIB_OBJS += sha1-file.o
984984
LIB_OBJS += sha1-name.o

‎bisect.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "run-command.h"
1111
#include "log-tree.h"
1212
#include "bisect.h"
13-
#include "sha1-array.h"
13+
#include "oid-array.h"
1414
#include "argv-array.h"
1515
#include "commit-slab.h"
1616
#include "commit-reach.h"

‎builtin/cat-file.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "userdiff.h"
1313
#include "streaming.h"
1414
#include "tree-walk.h"
15-
#include "sha1-array.h"
15+
#include "oid-array.h"
1616
#include "packfile.h"
1717
#include "object-store.h"
1818
#include "promisor-remote.h"

‎builtin/diff.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "log-tree.h"
1818
#include "builtin.h"
1919
#include "submodule.h"
20-
#include "sha1-array.h"
20+
#include "oid-array.h"
2121

2222
#define DIFF_NO_INDEX_EXPLICIT 1
2323
#define DIFF_NO_INDEX_IMPLICIT 2

‎builtin/fetch-pack.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include "fetch-pack.h"
44
#include "remote.h"
55
#include "connect.h"
6-
#include "sha1-array.h"
6+
#include "oid-array.h"
77
#include "protocol.h"
88

99
static const char fetch_pack_usage[] =

‎builtin/pack-objects.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include "pack-bitmap.h"
2727
#include "delta-islands.h"
2828
#include "reachable.h"
29-
#include "sha1-array.h"
29+
#include "oid-array.h"
3030
#include "argv-array.h"
3131
#include "list.h"
3232
#include "packfile.h"

‎builtin/pull.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "parse-options.h"
1313
#include "exec-cmd.h"
1414
#include "run-command.h"
15-
#include "sha1-array.h"
15+
#include "oid-array.h"
1616
#include "remote.h"
1717
#include "dir.h"
1818
#include "rebase.h"

‎builtin/receive-pack.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "remote.h"
1414
#include "connect.h"
1515
#include "string-list.h"
16-
#include "sha1-array.h"
16+
#include "oid-array.h"
1717
#include "connected.h"
1818
#include "argv-array.h"
1919
#include "version.h"

‎builtin/send-pack.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "quote.h"
1212
#include "transport.h"
1313
#include "version.h"
14-
#include "sha1-array.h"
14+
#include "oid-array.h"
1515
#include "gpg-interface.h"
1616
#include "gettext.h"
1717
#include "protocol.h"

‎builtin/tag.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "diff.h"
1818
#include "revision.h"
1919
#include "gpg-interface.h"
20-
#include "sha1-array.h"
20+
#include "oid-array.h"
2121
#include "column.h"
2222
#include "ref-filter.h"
2323

0 commit comments

Comments
 (0)