summaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2009-02-13 13:26:09 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-02-13 18:20:44 -0800
commite9cc02f0e41fd5d2f51e3c3f2b4f8cfa9e434432 (patch)
treeaded218cfeff8d691a0b2b68c027e2d099621ee4 /ll-merge.h
parentRemove redundant bit clears from diff_setup() (diff)
downloadtgif-e9cc02f0e41fd5d2f51e3c3f2b4f8cfa9e434432.tar.xz
symbolic-ref: allow refs/<whatever> in HEAD
Commit afe5d3d5 introduced a safety valve to symbolic-ref to disallow installing an invalid HEAD. It was accompanied by b229d18a, which changed validate_headref to require that HEAD contain a pointer to refs/heads/ instead of just refs/. Therefore, the safety valve also checked for refs/heads/. As it turns out, topgit is using refs/top-bases/ in HEAD, leading us to re-loosen (at least temporarily) the validate_headref check made in b229d18a. This patch does the corresponding loosening for the symbolic-ref safety valve, so that the two are in agreement once more. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions