From dd621df9cde83fc08f9d3924b793b989b8f8a313 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 4 Nov 2011 14:14:05 -0700 Subject: [PATCH] refs DWIMmery: use the same rule for both "git fetch" and others "git log frotz" can DWIM to "refs/remotes/frotz/HEAD", but in the remote access context, "git fetch frotz" to fetch what the other side happened to have fetched from what it calls 'frotz' (which may not have any relation to what we consider is 'frotz') the last time would not make much sense, so the fetch rules table did not include "refs/remotes/%.*s/HEAD". When the user really wants to, "git fetch $there remotes/frotz/HEAD" would let her do so anyway, so this is not about safety or security; it merely is about confusion avoidance and discouraging meaningless usage. Specifically, it is _not_ about ambiguity avoidance. A name that would become ambiguous if we use the same rules table for both fetch and local rev-parse would be ambiguous locally at the remote side. So for the same reason as we added rule to allow "git fetch $there v1.0" instead of "git fetch $there tags/v1.0" in the previous commit, here is a bit longer rope for the users, which incidentally simplifies our code. Signed-off-by: Junio C Hamano --- cache.h | 2 +- refs.c | 8 -------- t/t5510-fetch.sh | 5 ++--- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/cache.h b/cache.h index be07ec708..26322dd52 100644 --- a/cache.h +++ b/cache.h @@ -873,7 +873,7 @@ extern int get_sha1_mb(const char *str, unsigned char *sha1); extern int refname_match(const char *abbrev_name, const char *full_name, const char **rules); extern const char *ref_rev_parse_rules[]; -extern const char *ref_fetch_rules[]; +#define ref_fetch_rules ref_rev_parse_rules extern int create_symref(const char *ref, const char *refs_heads_master, const char *logmsg); extern int validate_headref(const char *ref); diff --git a/refs.c b/refs.c index ff20eeb5b..026c7ea25 100644 --- a/refs.c +++ b/refs.c @@ -995,14 +995,6 @@ const char *ref_rev_parse_rules[] = { NULL }; -const char *ref_fetch_rules[] = { - "%.*s", - "refs/%.*s", - "refs/tags/%.*s", - "refs/heads/%.*s", - NULL -}; - int refname_match(const char *abbrev_name, const char *full_name, const char **rules) { const char **p; diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh index 7e433b179..251d138aa 100755 --- a/t/t5510-fetch.sh +++ b/t/t5510-fetch.sh @@ -116,7 +116,7 @@ test_expect_success 'fetch must not resolve short tag name' ' ' -test_expect_success 'fetch must not resolve short remote name' ' +test_expect_success 'fetch can now resolve short remote name' ' cd "$D" && git update-ref refs/remotes/six/HEAD HEAD && @@ -125,8 +125,7 @@ test_expect_success 'fetch must not resolve short remote name' ' cd six && git init && - test_must_fail git fetch .. six:six - + git fetch .. six:six ' test_expect_success 'create bundle 1' ' -- 2.26.2