[PATCH v2 4/6] worktree: make core.sparseCheckout and core.ignoreStat per-worktree
From: Nguyễn Thái Ngọc Duy <hidden>
Date: 2016-06-15 23:07:34
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
The first one must be per-worktree because info/sparse-checkout already is. The second one shares the same nature and should also be per-worktree. Signed-off-by: Nguyễn Thái Ngọc Duy <redacted> --- Documentation/git-worktree.txt | 2 +- Documentation/technical/repository-version.txt | 2 +- config.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
index 087b35e..bc6a26e 100644
--- a/Documentation/git-worktree.txt
+++ b/Documentation/git-worktree.txt@@ -157,7 +157,7 @@ $GIT_COMMON_DIR/worktrees/X/config. Even though per-working tree variables for the main working tree are in the default config place, they are invisible from all linked working trees. The following configuration variables are per working directory: -core.bare, core.worktree. +core.bare, core.ignorestat, core.sparsecheckout, core.worktree. LIST OUTPUT FORMAT ------------------
diff --git a/Documentation/technical/repository-version.txt b/Documentation/technical/repository-version.txt
index fc2cdb9..4fc113b 100644
--- a/Documentation/technical/repository-version.txt
+++ b/Documentation/technical/repository-version.txt@@ -94,4 +94,4 @@ Define behavior in multiple worktree setup. The value specifies the version. Default version is zero. In version 1, the following config variables are per-worktree: -core.bare, core.worktree. +core.bare, core.ignorestat, core.sparsecheckout, core.worktree.
diff --git a/config.c b/config.c
index c2ea91b..5aa1379 100644
--- a/config.c
+++ b/config.c@@ -49,6 +49,8 @@ static int zlib_compression_seen; static struct config_pattern worktree_v1[] = { { 0, 0, "core.bare" }, + { 0, 0, "core.ignorestat" }, + { 0, 0, "core.sparsecheckout" }, { 0, 0, "core.worktree" }, { 0, 0, NULL } };
--
2.3.0.rc1.137.g477eb31