diff options
| author |  Jiang Xin <worldhello.net@gmail.com> | 2019-08-10 20:11:17 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2019-08-10 20:11:17 +0800 |
| commit | d6d5cbfe87e2eb025ba316afe74b74d009cfd330 (patch) | |
| tree | 45035c13b4ea6696000788dcf10c54b588f0bc9b /t/t1309-early-config.sh | |
| parent | l10n: bg.po: Updated Bulgarian translation (4674t) (diff) | |
| parent | Git 2.23-rc2 (diff) | |
| download | tgif-d6d5cbfe87e2eb025ba316afe74b74d009cfd330.tar.xz | |
Merge tag 'v2.23.0-rc2' of git://git.kernel.org/pub/scm/git/git
Git 2.23-rc2
* tag 'v2.23.0-rc2' of git://git.kernel.org/pub/scm/git/git: (63 commits)
Git 2.23-rc2
t0000: reword comments for "local" test
t: decrease nesting in test_oid_to_path
sha1-file: release strbuf after use
test-dir-iterator: use path argument directly
dir-iterator: release strbuf after use
commit-graph: release strbufs after use
l10n: reformat some localized strings for v2.23.0
merge-recursive: avoid directory rename detection in recursive case
commit-graph: fix bug around octopus merges
restore: fix typo in docs
doc: typo: s/can not/cannot/ and s/is does/does/
Git 2.23-rc1
log: really flip the --mailmap default
RelNotes/2.23.0: fix a few typos and other minor issues
RelNotes/2.21.1: typofix
log: flip the --mailmap default unconditionally
config: work around bug with includeif:onbranch and early config
A few more last-minute fixes
repack: simplify handling of auto-bitmaps and .keep files
...
Diffstat (limited to 't/t1309-early-config.sh')
| -rwxr-xr-x | t/t1309-early-config.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t1309-early-config.sh b/t/t1309-early-config.sh index 413642aa56..0c37e7180d 100755 --- a/t/t1309-early-config.sh +++ b/t/t1309-early-config.sh @@ -89,4 +89,9 @@ test_expect_failure 'ignore .git/ with invalid config' ' test_with_config "[" ' +test_expect_success 'early config and onbranch' ' + echo "[broken" >broken && + test_with_config "[includeif \"onbranch:refs/heads/master\"]path=../broken" +' + test_done |