[RFC/PATCH v4 26/49] odb-helper: add script_mode
From: Christian Couder <hidden>
Date: 2017-06-20 07:56:34
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Christian Couder <redacted> --- external-odb.c | 4 ++++ odb-helper.h | 1 + t/t0400-external-odb.sh | 2 ++ t/t0410-transfer-e-odb.sh | 2 ++ t/t0420-transfer-http-e-odb.sh | 7 ++++++- 5 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/external-odb.c b/external-odb.c
index 502380cac2..2efa805d12 100644
--- a/external-odb.c
+++ b/external-odb.c@@ -49,6 +49,10 @@ static int external_odb_config(const char *var, const char *value, void *data) if (!strcmp(key, "command")) return git_config_string(&o->cmd, var, value); + if (!strcmp(key, "scriptmode")) { + o->script_mode = git_config_bool(var, value); + return 0; + } if (!strcmp(key, "fetchkind")) { const char *fetch_kind; int ret = git_config_string(&fetch_kind, var, value);
diff --git a/odb-helper.h b/odb-helper.h
index 2dc6d96c40..44c98bbf56 100644
--- a/odb-helper.h
+++ b/odb-helper.h@@ -13,6 +13,7 @@ struct odb_helper { const char *name; const char *cmd; enum odb_helper_fetch_kind fetch_kind; + int script_mode; struct odb_helper_object { unsigned char sha1[20];
diff --git a/t/t0400-external-odb.sh b/t/t0400-external-odb.sh
index c3cb0fdc84..18d8c38862 100755
--- a/t/t0400-external-odb.sh
+++ b/t/t0400-external-odb.sh@@ -49,6 +49,7 @@ test_expect_success 'alt objects are missing' ' test_expect_success 'helper can retrieve alt objects' ' test_config odb.magic.command "$HELPER" && + test_config odb.magic.scriptMode true && test_config odb.magic.fetchKind "gitObject" && cat >expect <<-\EOF && two
@@ -69,6 +70,7 @@ test_expect_success 'helper can add objects to alt repo' ' test_expect_success 'commit adds objects to alt repo' ' test_config odb.magic.command "$HELPER" && + test_config odb.magic.scriptMode true && test_config odb.magic.fetchKind "gitObject" && test_commit three && hash3=$(git ls-tree HEAD | grep three.t | cut -f1 | cut -d\ -f3) &&
diff --git a/t/t0410-transfer-e-odb.sh b/t/t0410-transfer-e-odb.sh
index cba89866e2..8de9a08d7c 100755
--- a/t/t0410-transfer-e-odb.sh
+++ b/t/t0410-transfer-e-odb.sh@@ -90,6 +90,7 @@ test_expect_success 'setup first alternate repo' ' git init alt-repo1 && test_commit zero && git config odb.magic.command "$HELPER1" && + git config odb.magic.scriptMode true && git config odb.magic.fetchKind "gitObject" '
@@ -120,6 +121,7 @@ test_expect_success 'other repo gets the blobs from object store' ' test_must_fail git cat-file blob "$hash1" && test_must_fail git cat-file blob "$hash2" && git config odb.magic.command "$HELPER2" && + git config odb.magic.scriptMode true && git config odb.magic.fetchKind "gitObject" git cat-file blob "$hash1" && git cat-file blob "$hash2"
diff --git a/t/t0420-transfer-http-e-odb.sh b/t/t0420-transfer-http-e-odb.sh
index 8a5f3adaa7..b8062d14c0 100755
--- a/t/t0420-transfer-http-e-odb.sh
+++ b/t/t0420-transfer-http-e-odb.sh@@ -53,6 +53,7 @@ HELPER="\"$PWD\"/odb-http-helper" test_expect_success 'setup repo with a root commit and the helper' ' test_commit zero && git config odb.magic.command "$HELPER" && + git config odb.magic.scriptMode true && git config odb.magic.fetchKind "plainObject" '
@@ -108,6 +109,7 @@ test_expect_success 'update other repo from the first one' ' git fetch origin "refs/odbs/magic/*:refs/odbs/magic/*" && test_must_fail git cat-file blob "$hash1" && git config odb.magic.command "$HELPER" && + git config odb.magic.scriptMode true && git config odb.magic.fetchKind "plainObject" && git cat-file blob "$hash1" && git pull origin master)
@@ -131,6 +133,7 @@ test_expect_success 'no-local clone from the first repo with helper succeeds' ' mkdir my-other-clone && (cd my-other-clone && git clone -c odb.magic.command="$HELPER" \ + -c odb.magic.scriptMode="true" \ -c odb.magic.plainObjects="true" \ --no-local .. .) && rm -rf my-other-clone
@@ -141,7 +144,9 @@ test_expect_success 'no-local initial-refspec clone succeeds' ' (cd my-other-clone && git config odb.magic.command "$HELPER" && git config odb.magic.fetchKind "plainObject" && - git -c odb.magic.command="$HELPER" -c odb.magic.plainObjects="true" \ + git -c odb.magic.command="$HELPER" \ + -c odb.magic.plainObjects="true" \ + -c odb.magic.scriptMode="true" \ clone --no-local --initial-refspec "refs/odbs/magic/*:refs/odbs/magic/*" .. .) '
--
2.13.1.565.gbfcd7a9048