]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 51cf315 85fe0e8)
Merge branch 'js/early-config-with-onbranch'
authorJunio C Hamano <gitster@pobox.com>
Fri, 2 Aug 2019 20:12:02 +0000 (13:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Aug 2019 20:12:02 +0000 (13:12 -0700)
commite46249f73ebddca06cf16c01e8de1f310360c856
treedd8f3bd4c4b56cd5b24ba24d281b037a08eb4d77tree | snapshot
parent51cf315870bbb7254ddf06c84fe03b41bc48eebdcommit | diff
parent85fe0e800ca6acc690fc4c55931a200b4679211ecommit | diff
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
Unnamed repository; edit this file 'description' to name the repository.