Jeff King [off-list ref] writes:
On Fri, Feb 13, 2009 at 06:02:56PM -0800, Junio C Hamano wrote:
quoted
quoted
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 <redacted>
Actually we should simply revert afe5d3d5 altogether with the above
message, as it introduced a test that expects the tightened behaviour.
Is there any reason to throw away the "must be in refs/" safety valve,
though? That was the actual patch I started with and solved my problem,
and the "tighten to refs/heads/" bit came from discussion. That is, I
think having a safety valve in symbolic-ref that matches
validate_headref is orthogonal to how tightly validate_headref matches.
But yes, I obviously failed to run the test suite on the follow-up patch
I sent. The final test in t1401 would need to be reverted, as well.
Sure.
On Fri, Feb 13, 2009 at 06:16:23PM -0800, Junio C Hamano wrote:
quoted
Is there any reason to throw away the "must be in refs/" safety valve,
though? That was the actual patch I started with and solved my problem,
and the "tighten to refs/heads/" bit came from discussion. That is, I
think having a safety valve in symbolic-ref that matches
validate_headref is orthogonal to how tightly validate_headref matches.
But yes, I obviously failed to run the test suite on the follow-up patch
I sent. The final test in t1401 would need to be reverted, as well.
Sure.
OK, here is the updated patch (that actually passes the test suite).
-- >8 --
Subject: [PATCH] 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/.
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 check,
so that the two are in agreement once more.
Signed-off-by: Jeff King <redacted>
---
builtin-symbolic-ref.c | 4 ++--
t/t1401-symbolic-ref.sh | 5 -----
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/builtin-symbolic-ref.c b/builtin-symbolic-ref.c
index cafc4eb..6ae6bcc 100644
--- a/builtin-symbolic-ref.c
+++ b/builtin-symbolic-ref.c
@@ -45,8 +45,8 @@ int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)
break;
case 2:
if (!strcmp(argv[0], "HEAD") &&
- prefixcmp(argv[1], "refs/heads/"))
- die("Refusing to point HEAD outside of refs/heads/");
+ prefixcmp(argv[1], "refs/"))
+ die("Refusing to point HEAD outside of refs/");
create_symref(argv[0], argv[1], msg);
break;
default:diff --git a/t/t1401-symbolic-ref.sh b/t/t1401-symbolic-ref.sh
index 569f341..7fa5f5b 100755
--- a/t/t1401-symbolic-ref.sh
+++ b/t/t1401-symbolic-ref.sh
@@ -27,11 +27,6 @@ test_expect_success 'symbolic-ref refuses non-ref for HEAD' '
'
reset_to_sane
-test_expect_success 'symbolic-ref refuses non-branch for HEAD' '
- test_must_fail git symbolic-ref HEAD refs/foo
-'
-reset_to_sane
-
test_expect_success 'symbolic-ref refuses bare sha1' '
echo content >file && git add file && git commit -m one
test_must_fail git symbolic-ref HEAD `git rev-parse HEAD`
--
1.6.2.rc0.241.g088a