From: Han-Wen Nienhuys <hanwen@xxxxxxxxxx>
* Add GIT_TEST_REFTABLE environment var to control default ref storage
* Add test_prerequisite REFTABLE.
* Skip some tests that are incompatible:
* t3210-pack-refs.sh - does not apply
* t9903-bash-prompt - The bash mode reads .git/HEAD directly
* t1450-fsck.sh - manipulates .git/ directly to create invalid state
Major test failures:
* t1400-update-ref.sh - Reads from .git/{refs,logs} directly
* t1404-update-ref-errors.sh - Manipulates .git/refs/ directly
* t1405 - inspecs .git/ directly.
t6030-bisect-porcelain.sh - 62 of 72
t2400-worktree-add.sh - 58 of 69
t3200-branch.sh - 58 of 145
t7406-submodule-update.sh - 54 of 54
t5601-clone.sh - 51 of 105
t9903-bash-prompt.sh - 50 of 66
t1404-update-ref-errors.sh - 44 of 53
t5510-fetch.sh - 40 of 171
t7400-submodule-basic.sh - 38 of 111
t3514-cherry-pick-revert-gpg.sh - 36 of 36
..
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/t1450-fsck.sh | 6 ++++++
t/t3210-pack-refs.sh | 6 ++++++
t/t9903-bash-prompt.sh | 6 ++++++
t/test-lib.sh | 5 +++++
8 files changed, 34 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 9b456a46712..6886330da41 100644
--- a/refs.c
+++ b/refs.c
@@ -1743,7 +1743,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);
if (getenv("GIT_DEBUG_REFS")) {
r->refs_private = debug_wrap(r->refs_private);
@@ -1802,7 +1802,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);
@@ -1816,7 +1816,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/t1450-fsck.sh b/t/t1450-fsck.sh
index 449ebc5657c..9f605433033 100755
--- a/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh
@@ -8,6 +8,12 @@ test_description='git fsck random collection of tests
. ./test-lib.sh
+if test_have_prereq REFTABLE
+then
+ skip_all='skipping tests; incompatible with reftable'
+ test_done
+fi
+
test_expect_success setup '
test_oid_init &&
git config gc.auto 0 &&
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/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh
index ab5da2cabc4..5deaaf968b0 100755
--- a/t/t9903-bash-prompt.sh
+++ b/t/t9903-bash-prompt.sh
@@ -7,6 +7,12 @@ test_description='test git-specific bash prompt functions'
. ./lib-bash.sh
+if test_have_prereq REFTABLE
+then
+ skip_all='skipping tests; incompatible with reftable'
+ test_done
+fi
+
. "$GIT_BUILD_DIR/contrib/completion/git-prompt.sh"
actual="$TRASH_DIRECTORY/actual"
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
