tree dd8f3bd4c4b56cd5b24ba24d281b037a08eb4d77
parent 51cf315870bbb7254ddf06c84fe03b41bc48eebd
parent 85fe0e800ca6acc690fc4c55931a200b4679211e
author Junio C Hamano <gitster@pobox.com> 1564776722 -0700
committer Junio C Hamano <gitster@pobox.com> 1564776722 -0700

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