summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-08-14 10:57:24 -0700
committerJunio C Hamano <gitster@pobox.com>2013-08-14 15:04:24 -0700
commit2c2b6646c2723459dbd334c7ced6f77ffb0d596e (patch)
tree2db617e34a62cc84d1c744e14913b916202eb820 /t
parentc1ebd90c832e28ff27654c21f9985aebe986352d (diff)
downloadgit-2c2b6646c2723459dbd334c7ced6f77ffb0d596e.tar.gz
Revert "Add new @ shortcut for HEAD"
This reverts commit cdfd94837b27c220f70f032b596ea993d195488f, as it does not just apply to "@" (and forms with modifiers like @{u} applied to it), but also affects e.g. "refs/heads/@/foo", which it shouldn't. The basic idea of giving a short-hand might be good, and the topic can be retried later, but let's revert to avoid affecting existing use cases for now for the upcoming release.
Diffstat (limited to 't')
-rwxr-xr-xt/t1508-at-combinations.sh2
1 files changed, 0 insertions, 2 deletions
diff --git a/t/t1508-at-combinations.sh b/t/t1508-at-combinations.sh
index 4db1613f8a..e5aea3b896 100755
--- a/t/t1508-at-combinations.sh
+++ b/t/t1508-at-combinations.sh
@@ -55,8 +55,6 @@ check "HEAD@{u}" ref refs/heads/upstream-branch
check "@{u}@{1}" commit upstream-one
check "@{-1}@{u}" ref refs/heads/master
check "@{-1}@{u}@{1}" commit master-one
-check "@" commit new-two
-check "@@{u}" ref refs/heads/upstream-branch
nonsense "@{u}@{-1}"
nonsense "@{0}@{0}"
nonsense "@{1}@{u}"