diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-08-02 20:12:02 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-08-02 20:12:02 (GMT) |
| commit | e46249f73ebddca06cf16c01e8de1f310360c856 (patch) | |
| tree | dd8f3bd4c4b56cd5b24ba24d281b037a08eb4d77 /t | |
| parent | 51cf315870bbb7254ddf06c84fe03b41bc48eebd (diff) | |
| parent | 85fe0e800ca6acc690fc4c55931a200b4679211e (diff) | |
| download | git-e46249f73ebddca06cf16c01e8de1f310360c856.zip git-e46249f73ebddca06cf16c01e8de1f310360c856.tar.gz git-e46249f73ebddca06cf16c01e8de1f310360c856.tar.bz2 | |
Merge branch 'js/early-config-with-onbranch'
The recently added [includeif "onbranch:branch"] feature does not
work well with an early config mechanism, as it attempts to find
out what branch we are on before we even haven't located the git
repository. The inclusion during early config scan is ignored to
work around this issue.
* js/early-config-with-onbranch:
config: work around bug with includeif:onbranch and early config
Diffstat (limited to 't')
| -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 413642a..0c37e71 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 |