summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Phil Pennock <phil@apcera.com>2012-11-05 18:50:47 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-11-21 11:55:59 -0800
commitaf507944a22a3dabe2041fe629b2178abb5c642f (patch)
treea6b941c2e6a5ca31de4634ff22ba54b5ec31207f /git-merge-octopus.sh
parentMerge branch 'tj/maint-doc-commit-sign' (diff)
downloadtgif-af507944a22a3dabe2041fe629b2178abb5c642f.tar.xz
gitweb: make remote_heads config setting work
Git configuration items can not contain underscores in their section and bottom-level variable name; the 'remote_heads' feature can not be enabled on a per-repository basis with that name. This changes the git-config option to be `gitweb.remoteheads` but does not change the gitweb.conf option, to avoid backwards compatibility issues. We strip underscores from keys before looking through git-config output for them. An existing check on keynames was overly eager to reject non-word letters, but if we ever start using three-level names, the middle level string can contain almost anything, so fix that as well while we are in the vicinity. Signed-off-by: Phil Pennock <phil@apcera.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions