introduce GIT_INDEX_VERSION environment variable

Respect a GIT_INDEX_VERSION environment variable, when a new index is
initialized.  Setting the environment variable will not cause existing
index files to be converted to another format, but will only affect
newly written index files.  This can be used to initialize repositories
with index-v4.

Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 02bbc084b8d72b33af08a6fee7d8f1943e870e24..27a199ca1af53c25f7b3e41501402244b11614d4 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -720,6 +720,11 @@ Git so take care if using Cogito etc.
        index file. If not specified, the default of `$GIT_DIR/index`
        is used.
 
+'GIT_INDEX_VERSION'::
+       This environment variable allows the specification of an index
+       version for new repositories.  It won't affect existing index
+       files.  By default index file version [23] is used.
+
 'GIT_OBJECT_DIRECTORY'::
        If the object storage directory is specified via this
        environment variable then the sha1 directories are created

diff --git a/read-cache.c b/read-cache.c
index 33dd676ccbbd24e0bace49347f1f5d81b5099bcc..efc4aaed98af84a4f1cffb87416f0730b73bbaef 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -1219,6 +1219,25 @@ static struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int reall
 
 #define INDEX_FORMAT_DEFAULT 3
 
+static unsigned int get_index_format_default(void)
+{
+       char *envversion = getenv("GIT_INDEX_VERSION");
+       if (!envversion) {
+               return INDEX_FORMAT_DEFAULT;
+       } else {
+               char *endp;
+               unsigned int version = strtoul(envversion, &endp, 10);
+
+               if (*endp ||
+                   version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {
+                       warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"
+                                 "Using version %i"), INDEX_FORMAT_DEFAULT);
+                       version = INDEX_FORMAT_DEFAULT;
+               }
+               return version;
+       }
+}
+
 /*
  * dev/ino/uid/gid/size are also just tracked to the low 32 bits
  * Again - this is just a (very strong in practice) heuristic that
@@ -1795,7 +1814,7 @@ int write_index(struct index_state *istate, int newfd)
        }
 
        if (!istate->version)
-               istate->version = INDEX_FORMAT_DEFAULT;
+               istate->version = get_index_format_default();
 
        /* demote version 3 to version 2 when the latter suffices */
        if (istate->version == 3 || istate->version == 2)

diff --git a/t/t1600-index.sh b/t/t1600-index.sh
new file mode 100755 (executable)
index 0000000..6195c55
--- /dev/null
+++ b/t/t1600-index.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+test_description='index file specific tests'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+       echo 1 >a
+'
+
+test_expect_success 'bogus GIT_INDEX_VERSION issues warning' '
+       (
+               rm -f .git/index &&
+               GIT_INDEX_VERSION=2bogus &&
+               export GIT_INDEX_VERSION &&
+               git add a 2>&1 | sed "s/[0-9]//" >actual.err &&
+               sed -e "s/ Z$/ /" <<-\EOF >expect.err &&
+                       warning: GIT_INDEX_VERSION set, but the value is invalid.
+                       Using version Z
+               EOF
+               test_i18ncmp expect.err actual.err
+       )
+'
+
+test_expect_success 'out of bounds GIT_INDEX_VERSION issues warning' '
+       (
+               rm -f .git/index &&
+               GIT_INDEX_VERSION=1 &&
+               export GIT_INDEX_VERSION &&
+               git add a 2>&1 | sed "s/[0-9]//" >actual.err &&
+               sed -e "s/ Z$/ /" <<-\EOF >expect.err &&
+                       warning: GIT_INDEX_VERSION set, but the value is invalid.
+                       Using version Z
+               EOF
+               test_i18ncmp expect.err actual.err
+       )
+'
+
+test_expect_success 'no warning with bogus GIT_INDEX_VERSION and existing index' '
+       (
+               GIT_INDEX_VERSION=1 &&
+               export GIT_INDEX_VERSION &&
+               git add a 2>actual.err &&
+               >expect.err &&
+               test_i18ncmp expect.err actual.err
+       )
+'
+
+test_done