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>
Jeff King committed
Feb 13, 2009 at 13:26 UTC
e9cc02f0e41fd5d2f51e3c3f2b4f8cfa9e434432
2 files changed
+2
-7
builtin-symbolic-ref.c
+2
-2
@@ -45,8 +45,8 @@ int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)
45
break;
46
case 2:
47
if (!strcmp(argv[0], "HEAD") &&
48
- prefixcmp(argv[1], "refs/heads/"))
49
- die("Refusing to point HEAD outside of refs/heads/");
48
+ prefixcmp(argv[1], "refs/"))
49
+ die("Refusing to point HEAD outside of refs/");
50
create_symref(argv[0], argv[1], msg);
51
break;
52
default:
t/t1401-symbolic-ref.sh
-5
@@ -27,11 +27,6 @@ test_expect_success 'symbolic-ref refuses non-ref for HEAD' '
27
'
28
reset_to_sane
29
30
-test_expect_success 'symbolic-ref refuses non-branch for HEAD' '
31
- test_must_fail git symbolic-ref HEAD refs/foo
32
-'
33
-reset_to_sane
34
-
30
test_expect_success 'symbolic-ref refuses bare sha1' '
31
echo content >file && git add file && git commit -m one
32
test_must_fail git symbolic-ref HEAD `git rev-parse HEAD`