summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamkumar Ramachandra <artagnon@gmail.com>2014-01-12 22:41:04 +0530
committerJunio C Hamano <gitster@pobox.com>2014-01-17 09:39:53 -0800
commit086809e815dcd807ae3161c36bffb94c7ff60004 (patch)
treef056e8725bd048f0d7eafeb6f41f6b257cbd8839
parent2e0faca71a8011dadfb622338cc133723b33375f (diff)
downloadgit-jk/branch-at-publish-rebased.tar.gz
t1507 (rev-parse-upstream): fix typo in test titlejk/branch-at-publish-rebased
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t1507-rev-parse-upstream.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/t/t1507-rev-parse-upstream.sh b/t/t1507-rev-parse-upstream.sh
index 178694ee63..70aa631876 100755
--- a/t/t1507-rev-parse-upstream.sh
+++ b/t/t1507-rev-parse-upstream.sh
@@ -57,6 +57,10 @@ test_expect_success 'my-side@{upstream} resolves to correct full name' '
test refs/remotes/origin/side = "$(full_name my-side@{u})"
'
+test_expect_success 'refs/heads/my-side@{upstream} does not resolve to my-side@{upstream}' '
+ test_must_fail full_name refs/heads/my-side@{upstream}
+'
+
test_expect_success 'upstream of branch with @ in middle' '
full_name fun@ny@{u} >actual &&
echo refs/remotes/origin/side >expect &&