Skip to content

Commit 783ee36

Browse files
pks-tgitster
authored andcommitted
streaming: move into object database subsystem
The "streaming" terminology is somewhat generic, so it may not be immediately obvious that "streaming.{c,h}" is specific to the object database. Rectify this by moving it into the "odb/" directory so that it can be immediately attributed to the object subsystem. Signed-off-by: Patrick Steinhardt <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 1aed123 commit 783ee36

File tree

15 files changed

+14
-14
lines changed

15 files changed

+14
-14
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1201,6 +1201,7 @@ LIB_OBJS += object-file.o
12011201
LIB_OBJS += object-name.o
12021202
LIB_OBJS += object.o
12031203
LIB_OBJS += odb.o
1204+
LIB_OBJS += odb/streaming.o
12041205
LIB_OBJS += oid-array.o
12051206
LIB_OBJS += oidmap.o
12061207
LIB_OBJS += oidset.o
@@ -1294,7 +1295,6 @@ LIB_OBJS += split-index.o
12941295
LIB_OBJS += stable-qsort.o
12951296
LIB_OBJS += statinfo.o
12961297
LIB_OBJS += strbuf.o
1297-
LIB_OBJS += streaming.o
12981298
LIB_OBJS += string-list.o
12991299
LIB_OBJS += strmap.o
13001300
LIB_OBJS += strvec.o

archive-tar.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
#include "tar.h"
1313
#include "archive.h"
1414
#include "odb.h"
15+
#include "odb/streaming.h"
1516
#include "strbuf.h"
16-
#include "streaming.h"
1717
#include "run-command.h"
1818
#include "write-or-die.h"
1919

archive-zip.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
#include "gettext.h"
1111
#include "git-zlib.h"
1212
#include "hex.h"
13-
#include "streaming.h"
1413
#include "utf8.h"
1514
#include "odb.h"
15+
#include "odb/streaming.h"
1616
#include "strbuf.h"
1717
#include "userdiff.h"
1818
#include "write-or-die.h"

builtin/cat-file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
#include "list-objects-filter-options.h"
1919
#include "parse-options.h"
2020
#include "userdiff.h"
21-
#include "streaming.h"
2221
#include "oid-array.h"
2322
#include "packfile.h"
2423
#include "pack-bitmap.h"
2524
#include "object-file.h"
2625
#include "object-name.h"
2726
#include "odb.h"
27+
#include "odb/streaming.h"
2828
#include "replace-object.h"
2929
#include "promisor-remote.h"
3030
#include "mailmap.h"

builtin/fsck.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
#include "fsck.h"
1414
#include "parse-options.h"
1515
#include "progress.h"
16-
#include "streaming.h"
1716
#include "packfile.h"
1817
#include "object-file.h"
1918
#include "object-name.h"
2019
#include "odb.h"
20+
#include "odb/streaming.h"
2121
#include "path.h"
2222
#include "read-cache-ll.h"
2323
#include "replace-object.h"

builtin/index-pack.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
#include "progress.h"
1717
#include "fsck.h"
1818
#include "strbuf.h"
19-
#include "streaming.h"
2019
#include "thread-utils.h"
2120
#include "packfile.h"
2221
#include "pack-revindex.h"
2322
#include "object-file.h"
2423
#include "odb.h"
24+
#include "odb/streaming.h"
2525
#include "oid-array.h"
2626
#include "oidset.h"
2727
#include "path.h"

builtin/log.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include "refs.h"
1717
#include "object-name.h"
1818
#include "odb.h"
19+
#include "odb/streaming.h"
1920
#include "pager.h"
2021
#include "color.h"
2122
#include "commit.h"
@@ -35,7 +36,6 @@
3536
#include "parse-options.h"
3637
#include "line-log.h"
3738
#include "branch.h"
38-
#include "streaming.h"
3939
#include "version.h"
4040
#include "mailmap.h"
4141
#include "progress.h"

builtin/pack-objects.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include "pack-objects.h"
2323
#include "progress.h"
2424
#include "refs.h"
25-
#include "streaming.h"
2625
#include "thread-utils.h"
2726
#include "pack-bitmap.h"
2827
#include "delta-islands.h"
@@ -33,6 +32,7 @@
3332
#include "packfile.h"
3433
#include "object-file.h"
3534
#include "odb.h"
35+
#include "odb/streaming.h"
3636
#include "replace-object.h"
3737
#include "dir.h"
3838
#include "midx.h"

entry.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
#include "git-compat-util.h"
44
#include "odb.h"
5+
#include "odb/streaming.h"
56
#include "dir.h"
67
#include "environment.h"
78
#include "gettext.h"
89
#include "hex.h"
910
#include "name-hash.h"
1011
#include "sparse-index.h"
11-
#include "streaming.h"
1212
#include "submodule.h"
1313
#include "symlinks.h"
1414
#include "progress.h"

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,7 @@ libgit_sources = [
397397
'object-name.c',
398398
'object.c',
399399
'odb.c',
400+
'odb/streaming.c',
400401
'oid-array.c',
401402
'oidmap.c',
402403
'oidset.c',
@@ -490,7 +491,6 @@ libgit_sources = [
490491
'stable-qsort.c',
491492
'statinfo.c',
492493
'strbuf.c',
493-
'streaming.c',
494494
'string-list.c',
495495
'strmap.c',
496496
'strvec.c',

0 commit comments

Comments
 (0)