From: Johan Herland <johan@herland.net>
To: git@vger.kernel.org
Cc: johan@herland.net, gitster@pobox.com, jrnieder@gmail.com
Subject: [PATCHv2 02/10] t7900: Demonstrate failure to expand "$peer/$branch" according to refspecs
Date: Sat, 11 May 2013 18:21:12 +0200 [thread overview]
Message-ID: <1368289280-30337-3-git-send-email-johan@herland.net> (raw)
In-Reply-To: <1368289280-30337-1-git-send-email-johan@herland.net>
This test verifies that the following expressions all evaluate to the
full refname "refs/peers/origin/heads/master":
- refs/peers/origin/heads/master
- peers/origin/heads/master
- origin/heads/master
- origin/master
(We assume that there are no other conflicting refs for which the above
expressions would cause ambiguity.)
Currently none of these work, because the refs machinery don't know how
to expand shorthand names within the refs/peers/* hierarchy.
Mirroring the expansion of the above 4 expressions into the full refname,
the same 4 expressions 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 dfd916b..109e9b8 100755
--- a/t/t7900-working-with-namespaced-remote-refs.sh
+++ b/t/t7900-working-with-namespaced-remote-refs.sh
@@ -79,4 +79,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/peers/origin/heads/master >expect &&
+ git rev-parse --symbolic-full-name refs/peers/origin/heads/master >actual &&
+ test_cmp expect actual &&
+ git rev-parse --symbolic-full-name peers/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/peers/origin/heads/master >actual &&
+ test_cmp expect actual &&
+ git rev-parse --abbrev-ref peers/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
next prev parent reply other threads:[~2013-05-11 16:21 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-11 16:21 [PATCHv2 00/10] Prepare for alternative remote-tracking branch location Johan Herland
2013-05-11 16:21 ` [PATCHv2 01/10] t7900: Start testing usability of namespaced remote refs Johan Herland
2013-05-11 16:21 ` Johan Herland [this message]
2013-05-11 16:21 ` [PATCHv2 03/10] refs.c: Refactor code for mapping between shorthand names and full refnames Johan Herland
2013-05-13 4:56 ` Junio C Hamano
2013-05-13 6:31 ` Johan Herland
2013-05-13 6:45 ` Junio C Hamano
2013-05-13 20:34 ` Junio C Hamano
2013-05-14 14:24 ` Johan Herland
2013-05-14 17:50 ` Junio C Hamano
2013-05-15 6:45 ` Michael Haggerty
2013-05-15 7:39 ` Johan Herland
2013-05-15 13:53 ` Johan Herland
2013-05-15 15:14 ` Junio C Hamano
2013-05-15 19:49 ` Eric Wong
2013-05-11 16:21 ` [PATCHv2 04/10] remote: Reject remote names containing '/' Johan Herland
2013-05-13 4:48 ` Eric Sunshine
2013-05-13 6:32 ` Johan Herland
2013-05-13 4:54 ` Junio C Hamano
2013-05-13 6:53 ` Johan Herland
2013-05-16 9:48 ` Ramkumar Ramachandra
2013-05-16 11:17 ` Johan Herland
2013-05-16 12:14 ` Ramkumar Ramachandra
2013-05-11 16:21 ` [PATCHv2 05/10] refs.c: Add support for expanding/shortening refs in refs/peers/* Johan Herland
2013-05-11 16:21 ` [PATCHv2 06/10] t7900: Test git branch -r/-a output w/remote-tracking branches " Johan Herland
2013-05-11 16:21 ` [PATCHv2 07/10] t3203: Add testcase for fix in 1603ade81352a526ccb206f41ff81ecbc855df2d Johan Herland
2013-05-11 16:21 ` [PATCHv2 08/10] builtin/branch.c: Refactor ref_item.name and .dest into strbufs Johan Herland
2013-05-11 16:21 ` [PATCHv2 09/10] builtin/branch.c: Refactor "remotes/" prepending to remote-tracking branches Johan Herland
2013-05-11 16:21 ` [PATCHv2 10/10] branch: Fix display of remote branches in refs/peers/* Johan Herland
2013-05-13 5:19 ` Eric Sunshine
2013-05-13 6:55 ` Johan Herland
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=1368289280-30337-3-git-send-email-johan@herland.net \
--to=johan@herland.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.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).