"Han-Wen Nienhuys via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes:
> This adds the reftable library, and hooks it up as a ref backend.
Since I queued the topic to 'pu', I needed to apply these fix-up
patches on top. The change to the Makefile is about "make clean"
which forgot to clean the reftable library. All the rest are ws
clean-ups.
There are build breakages reported on Windows, with possible fixes
(which IIRC were reported to segfault X-<), but I do not have URL or
message-IDs handy.
Thanks.
Makefile | 2 +-
builtin/clone.c | 2 +-
builtin/init-db.c | 4 ++--
cache.h | 2 +-
reftable/reftable.h | 8 ++++----
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index 9c1a7f0b81..3d5a585d8f 100644
--- a/Makefile
+++ b/Makefile
@@ -3126,7 +3126,7 @@ cocciclean:
clean: profile-clean coverage-clean cocciclean
$(RM) *.res
$(RM) $(OBJECTS)
- $(RM) $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB)
+ $(RM) $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB) $(REFTABLE_LIB)
$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X
$(RM) $(TEST_PROGRAMS)
$(RM) $(FUZZ_PROGRAMS)
diff --git a/builtin/clone.c b/builtin/clone.c
index 3bead96e44..54b1441b95 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -1110,7 +1110,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
}
init_db(git_dir, real_git_dir, option_template,
- GIT_HASH_UNKNOWN,
+ GIT_HASH_UNKNOWN,
DEFAULT_REF_STORAGE, /* XXX */
INIT_DB_QUIET);
diff --git a/builtin/init-db.c b/builtin/init-db.c
index 888b421338..70645a1848 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -394,7 +394,7 @@ static void validate_hash_algorithm(struct repository_format *repo_fmt, int hash
int init_db(const char *git_dir, const char *real_git_dir,
const char *template_dir, int hash, const char *ref_storage_format,
- unsigned int flags)
+ unsigned int flags)
{
int reinit;
int exist_ok = flags & INIT_DB_EXIST_OK;
@@ -433,7 +433,7 @@ int init_db(const char *git_dir, const char *real_git_dir,
* is an attempt to reinitialize new repository with an old tool.
*/
check_repository_format(&repo_fmt);
- repo_fmt.ref_storage = xstrdup(ref_storage_format);
+ repo_fmt.ref_storage = xstrdup(ref_storage_format);
validate_hash_algorithm(&repo_fmt, hash);
diff --git a/cache.h b/cache.h
index 83c4908ba0..89e257b7a5 100644
--- a/cache.h
+++ b/cache.h
@@ -628,7 +628,7 @@ int path_inside_repo(const char *prefix, const char *path);
int init_db(const char *git_dir, const char *real_git_dir,
const char *template_dir, int hash_algo,
- const char *ref_storage_format,
+ const char *ref_storage_format,
unsigned int flags);
void initialize_repository_version(int hash_algo, const char *ref_storage_format);
diff --git a/reftable/reftable.h b/reftable/reftable.h
index 48722428b5..3086884be4 100644
--- a/reftable/reftable.h
+++ b/reftable/reftable.h
@@ -446,13 +446,13 @@ struct reftable_addition;
/*
returns a new transaction to add reftables to the given stack. As a side
effect, the ref database is locked.
-*/
+*/
int reftable_stack_new_addition(struct reftable_addition **dest, struct reftable_stack *st);
-/* Adds a reftable to transaction. */
+/* Adds a reftable to transaction. */
int reftable_addition_add(struct reftable_addition *add,
- int (*write_table)(struct reftable_writer *wr, void *arg),
- void *arg);
+ int (*write_table)(struct reftable_writer *wr, void *arg),
+ void *arg);
/* Commits the transaction, releasing the lock. */
int reftable_addition_commit(struct reftable_addition *add);
