Skip to content

Commit 78839e9

Browse files
jltoblergitster
authored andcommitted
object-file: relocate ODB transaction code
The bulk-checkin subsystem provides various functions to manage ODB transactions. Apart from {begin,end}_odb_transaction(), these functions are only used by the object-file subsystem to manage aspects of a transaction implementation specific to the files object source. Relocate all the transaction code in bulk-checkin to object-file. This simplifies the exposed transaction interface by reducing it to only {begin,end}_odb_transaction(). Function and type names are adjusted in the subsequent commit to better fit the new location. Signed-off-by: Justin Tobler <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent ca7d934 commit 78839e9

File tree

11 files changed

+410
-453
lines changed

11 files changed

+410
-453
lines changed

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -974,7 +974,6 @@ LIB_OBJS += blame.o
974974
LIB_OBJS += blob.o
975975
LIB_OBJS += bloom.o
976976
LIB_OBJS += branch.o
977-
LIB_OBJS += bulk-checkin.o
978977
LIB_OBJS += bundle-uri.o
979978
LIB_OBJS += bundle.o
980979
LIB_OBJS += cache-tree.o

builtin/add.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
#include "gettext.h"
1515
#include "pathspec.h"
1616
#include "run-command.h"
17+
#include "object-file.h"
1718
#include "parse-options.h"
1819
#include "path.h"
1920
#include "preload-index.h"
2021
#include "diff.h"
2122
#include "read-cache.h"
2223
#include "revision.h"
23-
#include "bulk-checkin.h"
2424
#include "strvec.h"
2525
#include "submodule.h"
2626
#include "add-interactive.h"

builtin/unpack-objects.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#define DISABLE_SIGN_COMPARE_WARNINGS
33

44
#include "builtin.h"
5-
#include "bulk-checkin.h"
65
#include "config.h"
76
#include "environment.h"
87
#include "gettext.h"

builtin/update-index.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#define DISABLE_SIGN_COMPARE_WARNINGS
99

1010
#include "builtin.h"
11-
#include "bulk-checkin.h"
1211
#include "config.h"
1312
#include "environment.h"
1413
#include "gettext.h"

0 commit comments

Comments
 (0)