git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johan Herland <johan@herland.net>
To: git@vger.kernel.org
Cc: johan@herland.net, gitster@pobox.com
Subject: [PATCH 3/7] t7900: Demonstrate failure to expand "$remote/$branch" according to refspecs
Date: Sun,  5 May 2013 01:55:45 +0200	[thread overview]
Message-ID: <1367711749-8812-4-git-send-email-johan@herland.net> (raw)
In-Reply-To: <1367711749-8812-1-git-send-email-johan@herland.net>

This test verifies that the following expressions all evaluate to the
full refname "refs/remotes/origin/heads/master":

 - refs/remotes/origin/heads/master
 - remotes/origin/heads/master
 - origin/heads/master
 - origin/master

Currently the last of these fail, because the "$remote/$branch" syntax only
works for remotes with conventional (refs/heads/*:refs/remotes/origin/*)
refspecs.

In order for users of namespaced remote refs (or any other unconventional
refspec configuration) to be able to use the "$remote/$branch" syntax, we
need to extend the parsing of "$remote/$branch" expressions to take the
configured refspecs into account (i.e. look up the fetch refspecs for
$remote, and map "refs/heads/$branch" through the refspecs to find the
corresponding remote-tracking branch name).

Mirroring the expansion of the above 4 expressions into the full refname,
the same 4 expression should also be shortened into "origin/master" when
abbreviating them into their shortest unambiguous representation, e.g.
when running "git rev-parse --abbrev-ref" on them. A (currently failing)
test verifying this behavior is also added by this patch.

Signed-off-by: Johan Herland <johan@herland.net>
---
 t/t7900-working-with-namespaced-remote-refs.sh | 28 ++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/t/t7900-working-with-namespaced-remote-refs.sh b/t/t7900-working-with-namespaced-remote-refs.sh
index af03ac9..cc25e76 100755
--- a/t/t7900-working-with-namespaced-remote-refs.sh
+++ b/t/t7900-working-with-namespaced-remote-refs.sh
@@ -85,4 +85,32 @@ test_expect_success 'work-around "clone" with namespaced remote refs' '
 	test_clone client
 '
 
+test_expect_success 'enter client repo' '
+	cd client
+'
+
+test_expect_failure 'short-hand notation expands correctly for remote-tracking branches' '
+	echo refs/remotes/origin/heads/master > expect &&
+	git rev-parse --symbolic-full-name refs/remotes/origin/heads/master > actual &&
+	test_cmp expect actual &&
+	git rev-parse --symbolic-full-name remotes/origin/heads/master > actual &&
+	test_cmp expect actual &&
+	git rev-parse --symbolic-full-name origin/heads/master > actual &&
+	test_cmp expect actual &&
+	git rev-parse --symbolic-full-name origin/master > actual &&
+	test_cmp expect actual
+'
+
+test_expect_failure 'remote-tracking branches are shortened correctly' '
+	echo origin/master > expect &&
+	git rev-parse --abbrev-ref refs/remotes/origin/heads/master > actual &&
+	test_cmp expect actual &&
+	git rev-parse --abbrev-ref remotes/origin/heads/master > actual &&
+	test_cmp expect actual &&
+	git rev-parse --abbrev-ref origin/heads/master > actual &&
+	test_cmp expect actual &&
+	git rev-parse --abbrev-ref origin/master > actual &&
+	test_cmp expect actual
+'
+
 test_done
-- 
1.8.1.3.704.g33f7d4f

  parent reply	other threads:[~2013-05-04 23:56 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-04 23:55 [PATCH 0/7] Make "$remote/$branch" work with unconventional refspecs Johan Herland
2013-05-04 23:55 ` [PATCH 1/7] shorten_unambiguous_ref(): Allow shortening refs/remotes/origin/HEAD to origin Johan Herland
2013-05-05 11:56   ` Bert Wesarg
2013-05-06 17:52   ` Junio C Hamano
2013-05-07 18:49     ` Johan Herland
2013-05-07 18:54       ` [PATCHv2 1/3] t1514: Add tests of shortening refnames in strict/loose mode Johan Herland
2013-05-07 18:54         ` [PATCHv2 2/3] t1514: Demonstrate failure to correctly shorten "refs/remotes/origin/HEAD" Johan Herland
2013-05-07 18:54         ` [PATCHv2 3/3] shorten_unambiguous_ref(): Fix shortening refs/remotes/origin/HEAD to origin Johan Herland
2013-05-07 21:03       ` [PATCH 1/7] shorten_unambiguous_ref(): Allow " Junio C Hamano
2013-05-07 21:31       ` Junio C Hamano
2013-05-07 22:03         ` Johan Herland
2013-05-07 22:06           ` Junio C Hamano
2013-05-07 22:37             ` Johan Herland
2013-05-04 23:55 ` [PATCH 2/7] t7900: Start testing usability of namespaced remote refs Johan Herland
2013-05-07  1:29   ` Junio C Hamano
2013-05-07 21:52     ` Johan Herland
2013-05-07 22:20       ` Junio C Hamano
2013-05-04 23:55 ` Johan Herland [this message]
2013-05-07  1:30   ` [PATCH 3/7] t7900: Demonstrate failure to expand "$remote/$branch" according to refspecs Junio C Hamano
2013-05-04 23:55 ` [PATCH 4/7] refs.c: Refactor rules for expanding shorthand names into full refnames Johan Herland
2013-05-07  1:36   ` Junio C Hamano
2013-05-04 23:55 ` [PATCH 5/7] refs.c: Refactor code for shortening full refnames into shorthand names Johan Herland
2013-05-07  1:44   ` Junio C Hamano
2013-05-04 23:55 ` [PATCH 6/7] refname_match(): Caller must declare if we're matching local or remote refs Johan Herland
2013-05-07  1:48   ` Junio C Hamano
2013-05-04 23:55 ` [PATCH 7/7] refs.c: Add rules for resolving refs using remote refspecs Johan Herland
2013-05-05  4:28 ` [PATCH 0/7] Make "$remote/$branch" work with unconventional refspecs Junio C Hamano
2013-05-05  9:59   ` Johan Herland
2013-05-05 19:02     ` Junio C Hamano
2013-05-05 22:26       ` Johan Herland
2013-05-05 22:36         ` Junio C Hamano
2013-05-06  1:02           ` Santi Béjar
2013-05-06  1:04             ` Santi Béjar
2013-05-06 17:11               ` Junio C Hamano
2013-05-06 19:17                 ` Santi Béjar
2013-05-06 17:06         ` Junio C Hamano
2013-05-06 17:20           ` Junio C Hamano
2013-05-06 23:42           ` Johan Herland
2013-05-07  2:11             ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1367711749-8812-4-git-send-email-johan@herland.net \
    --to=johan@herland.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).