v4 has just one minor change to unbreak a && chain in test_cmp_config.
Nguyễn Thái Ngọc Duy (2):
t1300: extract and use test_cmp_config()
worktree: add per-worktree config files
Documentation/config.txt | 12 +++-
Documentation/git-config.txt | 26 ++++++---
Documentation/git-worktree.txt | 33 +++++++++++
Documentation/gitrepository-layout.txt | 8 +++
builtin/config.c | 19 ++++++-
cache.h | 2 +
config.c | 11 ++++
environment.c | 1 +
setup.c | 40 ++++++++++---
t/t1300-config.sh | 79 +++++++-------------------
t/t2029-worktree-config.sh | 79 ++++++++++++++++++++++++++
t/test-lib-functions.sh | 23 ++++++++
12 files changed, 255 insertions(+), 78 deletions(-)
create mode 100755 t/t2029-worktree-config.sh
Range-diff against v3:
1: 445f985619 ! 1: 23c2ee8844 t1300: extract and use test_cmp_config()
@@ -201,7 +201,7 @@
+# test_cmp_config foo core.bar
+#
+test_cmp_config() {
-+ local GD
++ local GD &&
+ if test "$1" = "-C"
+ then
+ shift &&
2: 4c2d1bb37d = 2: 0d4dc8c6b0 worktree: add per-worktree config files
--
2.19.1.647.g708186aaf9
