Revision 2f3b28f27234a0130583131a6785c44e3dd1cac4 authored by Johannes Schindelin on 09 March 2023, 22:08:47 UTC, committed by Johannes Schindelin on 17 April 2023, 19:15:37 UTC
The `maint-2.30` branch accumulated quite a few fixes over the past two years. Most of those fixes were originally based on newer versions, and while the patches cherry-picked cleanly, we weren't diligent enough to pay attention to the CI builds and the GETTEXT_POISON job regressed. This topic branch fixes that. * js/gettext-poison-fixes t0033: GETTEXT_POISON fix t0003: GETTEXT_POISON fix, part 1 t0003: GETTEXT_POISON fix, conclusion t5619: GETTEXT_POISON fix t5604: GETTEXT_POISON fix, part 1 t5604: GETTEXT_POISON fix, conclusion
t2404-worktree-config.sh
#!/bin/sh
test_description="config file in multi worktree"
. ./test-lib.sh
test_expect_success 'setup' '
test_commit start
'
test_expect_success 'config --worktree in single worktree' '
git config --worktree foo.bar true &&
test_cmp_config true foo.bar
'
test_expect_success 'add worktrees' '
git worktree add wt1 &&
git worktree add wt2
'
test_expect_success 'config --worktree without extension' '
test_must_fail git config --worktree foo.bar false
'
test_expect_success 'enable worktreeConfig extension' '
git config core.repositoryformatversion 1 &&
git config extensions.worktreeConfig true &&
test_cmp_config true extensions.worktreeConfig &&
test_cmp_config 1 core.repositoryformatversion
'
test_expect_success 'config is shared as before' '
git config this.is shared &&
test_cmp_config shared this.is &&
test_cmp_config -C wt1 shared this.is &&
test_cmp_config -C wt2 shared this.is
'
test_expect_success 'config is shared (set from another worktree)' '
git -C wt1 config that.is also-shared &&
test_cmp_config also-shared that.is &&
test_cmp_config -C wt1 also-shared that.is &&
test_cmp_config -C wt2 also-shared that.is
'
test_expect_success 'config private to main worktree' '
git config --worktree this.is for-main &&
test_cmp_config for-main this.is &&
test_cmp_config -C wt1 shared this.is &&
test_cmp_config -C wt2 shared this.is
'
test_expect_success 'config private to linked worktree' '
git -C wt1 config --worktree this.is for-wt1 &&
test_cmp_config for-main this.is &&
test_cmp_config -C wt1 for-wt1 this.is &&
test_cmp_config -C wt2 shared this.is
'
test_expect_success 'core.bare no longer for main only' '
test_config core.bare true &&
test "$(git rev-parse --is-bare-repository)" = true &&
test "$(git -C wt1 rev-parse --is-bare-repository)" = true &&
test "$(git -C wt2 rev-parse --is-bare-repository)" = true
'
test_expect_success 'per-worktree core.bare is picked up' '
git -C wt1 config --worktree core.bare true &&
test "$(git rev-parse --is-bare-repository)" = false &&
test "$(git -C wt1 rev-parse --is-bare-repository)" = true &&
test "$(git -C wt2 rev-parse --is-bare-repository)" = false
'
test_expect_success 'config.worktree no longer read without extension' '
git config --unset extensions.worktreeConfig &&
test_cmp_config shared this.is &&
test_cmp_config -C wt1 shared this.is &&
test_cmp_config -C wt2 shared this.is
'
test_done
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...