From 2c2b6646c2723459dbd334c7ced6f77ffb0d596e Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 14 Aug 2013 10:57:24 -0700 Subject: 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. --- t/t1508-at-combinations.sh | 2 -- 1 file changed, 2 deletions(-) (limited to 't/t1508-at-combinations.sh') 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}" -- cgit v1.2.1