From: Han-Wen Nienhuys <hanwen@xxxxxxxxxx>
* Add GIT_TEST_REFTABLE environment var to control default ref storage
* Add test_prerequisite REFTABLE. Skip t/t3210-pack-refs.sh for REFTABLE.
Major test failures:
* t9903-bash-prompt - The bash mode reads .git/HEAD directly
* t1400-update-ref.sh - Reads from .git/{refs,logs} directly
* t1404-update-ref-errors.sh - Manipulates .git/refs/ directly
* t1405 - inspecs .git/ directly.
* t1450-fsck.sh - manipulates .git/ directly to create invalid state
* Rebase, cherry-pick: pseudo refs aren't written through the refs backend.
Other tests by decreasing brokenness:
t1407-worktree-ref-store.sh - 5 of 5
t1413-reflog-detach.sh - 7 of 7
t1415-worktree-refs.sh - 11 of 11
t3908-stash-in-worktree.sh - 2 of 2
t4207-log-decoration-colors.sh - 2 of 2
t5515-fetch-merge-logic.sh - 17 of 17
t5900-repo-selection.sh - 8 of 8
t6016-rev-list-graph-simplify-history.sh - 12 of 12
t5573-pull-verify-signatures.sh - 15 of 16
t5612-clone-refspec.sh - 12 of 13
t5514-fetch-multiple.sh - 11 of 12
t6030-bisect-porcelain.sh - 64 of 71
t5533-push-cas.sh - 15 of 17
t5539-fetch-http-shallow.sh - 7 of 8
t7413-submodule-is-active.sh - 7 of 8
t2400-worktree-add.sh - 59 of 69
t0100-previous.sh - 5 of 6
t7419-submodule-set-branch.sh - 5 of 6
t1404-update-ref-errors.sh - 44 of 53
t6003-rev-list-topo-order.sh - 29 of 35
t1409-avoid-packing-refs.sh - 9 of 11
t5541-http-push-smart.sh - 31 of 38
t5407-post-rewrite-hook.sh - 13 of 16
t9903-bash-prompt.sh - 52 of 66
t1414-reflog-walk.sh - 9 of 12
t1507-rev-parse-upstream.sh - 21 of 28
t2404-worktree-config.sh - 9 of 12
t1505-rev-parse-last.sh - 5 of 7
t7510-signed-commit.sh - 16 of 23
t2018-checkout-branch.sh - 15 of 22
(..etc)
Signed-off-by: Han-Wen Nienhuys <hanwen@xxxxxxxxxx>
---
builtin/clone.c | 2 +-
builtin/init-db.c | 2 +-
refs.c | 6 +++---
t/t1409-avoid-packing-refs.sh | 6 ++++++
t/t3210-pack-refs.sh | 6 ++++++
t/test-lib.sh | 5 +++++
6 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/builtin/clone.c b/builtin/clone.c
index 4d0cf065e4a..780c5807415 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -1109,7 +1109,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
}
init_db(git_dir, real_git_dir, option_template, GIT_HASH_UNKNOWN,
- DEFAULT_REF_STORAGE, INIT_DB_QUIET);
+ default_ref_storage(), INIT_DB_QUIET);
if (real_git_dir)
git_dir = real_git_dir;
diff --git a/builtin/init-db.c b/builtin/init-db.c
index b7053b9e370..da5b4670c84 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -545,7 +545,7 @@ static const char *const init_db_usage[] = {
int cmd_init_db(int argc, const char **argv, const char *prefix)
{
const char *git_dir;
- const char *ref_storage_format = DEFAULT_REF_STORAGE;
+ const char *ref_storage_format = default_ref_storage();
const char *real_git_dir = NULL;
const char *work_tree;
const char *template_dir = NULL;
diff --git a/refs.c b/refs.c
index 299a5db8bf1..b9b3e7e7070 100644
--- a/refs.c
+++ b/refs.c
@@ -1823,7 +1823,7 @@ struct ref_store *get_main_ref_store(struct repository *r)
r->refs_private = ref_store_init(r->gitdir,
r->ref_storage_format ?
r->ref_storage_format :
- DEFAULT_REF_STORAGE,
+ default_ref_storage(),
REF_STORE_ALL_CAPS);
return r->refs_private;
}
@@ -1879,7 +1879,7 @@ struct ref_store *get_submodule_ref_store(const char *submodule)
goto done;
/* assume that add_submodule_odb() has been called */
- refs = ref_store_init(submodule_sb.buf, DEFAULT_REF_STORAGE, /* XXX */
+ refs = ref_store_init(submodule_sb.buf, default_ref_storage(),
REF_STORE_READ | REF_STORE_ODB);
register_ref_store_map(&submodule_ref_stores, "submodule",
refs, submodule);
@@ -1893,7 +1893,7 @@ struct ref_store *get_submodule_ref_store(const char *submodule)
struct ref_store *get_worktree_ref_store(const struct worktree *wt)
{
- const char *format = DEFAULT_REF_STORAGE; /* XXX */
+ const char *format = default_ref_storage();
struct ref_store *refs;
const char *id;
diff --git a/t/t1409-avoid-packing-refs.sh b/t/t1409-avoid-packing-refs.sh
index be12fb63506..c6f78325563 100755
--- a/t/t1409-avoid-packing-refs.sh
+++ b/t/t1409-avoid-packing-refs.sh
@@ -4,6 +4,12 @@ test_description='avoid rewriting packed-refs unnecessarily'
. ./test-lib.sh
+if test_have_prereq REFTABLE
+then
+ skip_all='skipping pack-refs tests; incompatible with reftable'
+ test_done
+fi
+
# Add an identifying mark to the packed-refs file header line. This
# shouldn't upset readers, and it should be omitted if the file is
# ever rewritten.
diff --git a/t/t3210-pack-refs.sh b/t/t3210-pack-refs.sh
index f41b2afb996..edaef2c175a 100755
--- a/t/t3210-pack-refs.sh
+++ b/t/t3210-pack-refs.sh
@@ -11,6 +11,12 @@ semantic is still the same.
'
. ./test-lib.sh
+if test_have_prereq REFTABLE
+then
+ skip_all='skipping pack-refs tests; incompatible with reftable'
+ test_done
+fi
+
test_expect_success 'enable reflogs' '
git config core.logallrefupdates true
'
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 1b221951a8e..b2b16979407 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -1514,6 +1514,11 @@ FreeBSD)
;;
esac
+if test -n "$GIT_TEST_REFTABLE"
+then
+ test_set_prereq REFTABLE
+fi
+
( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1
test -z "$NO_PERL" && test_set_prereq PERL
test -z "$NO_PTHREADS" && test_set_prereq PTHREADS
--
gitgitgadget
