diff options
| -rw-r--r-- | bulk-checkin.c | 12 | ||||
| -rw-r--r-- | bulk-checkin.h | 7 |
2 files changed, 2 insertions, 17 deletions
diff --git a/bulk-checkin.c b/bulk-checkin.c index eb6ef704c3..5de848deff 100644 --- a/bulk-checkin.c +++ b/bulk-checkin.c @@ -376,15 +376,6 @@ struct odb_transaction *begin_odb_transaction(struct object_database *odb) return odb->transaction; } -void flush_odb_transaction(struct odb_transaction *transaction) -{ - if (!transaction) - return; - - flush_batch_fsync(transaction); - flush_bulk_checkin_packfile(transaction); -} - void end_odb_transaction(struct odb_transaction *transaction) { if (!transaction) @@ -395,7 +386,8 @@ void end_odb_transaction(struct odb_transaction *transaction) */ ASSERT(transaction == transaction->odb->transaction); - flush_odb_transaction(transaction); + flush_batch_fsync(transaction); + flush_bulk_checkin_packfile(transaction); transaction->odb->transaction = NULL; free(transaction); } diff --git a/bulk-checkin.h b/bulk-checkin.h index 51d0ac6134..eea728f0d4 100644 --- a/bulk-checkin.h +++ b/bulk-checkin.h @@ -44,13 +44,6 @@ int index_blob_bulk_checkin(struct odb_transaction *transaction, struct odb_transaction *begin_odb_transaction(struct object_database *odb); /* - * Make any objects that are currently part of a pending object - * database transaction visible. It is valid to call this function - * even if no transaction is active. - */ -void flush_odb_transaction(struct odb_transaction *transaction); - -/* * Tell the object database to make any objects from the * current transaction visible. */ |