diff options
author | Felipe Contreras <felipe.contreras@gmail.com> | 2013-05-07 17:04:31 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-05-08 12:13:12 -0700 |
commit | cdfd94837b27c220f70f032b596ea993d195488f (patch) | |
tree | a3b5f7b61e29f5c0c011b1712ae77c9d9945d746 /t/t1508-at-combinations.sh | |
parent | 7a0a49a7ca787433255280b66e7652b56f7beb6e (diff) | |
download | git-cdfd94837b27c220f70f032b596ea993d195488f.tar.gz |
Add new @ shortcut for HEAD
Typing 'HEAD' is tedious, especially when we can use '@' instead.
The reason for choosing '@' is that it follows naturally from the
ref@op syntax (e.g. HEAD@{u}), except we have no ref, and no
operation, and when we don't have those, it makes sens to assume
'HEAD'.
So now we can use 'git show @~1', and all that goody goodness.
Until now '@' was a valid name, but it conflicts with this idea, so
let's make it invalid. Probably very few people, if any, used this name.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1508-at-combinations.sh')
-rwxr-xr-x | t/t1508-at-combinations.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t1508-at-combinations.sh b/t/t1508-at-combinations.sh index e5aea3b896..4db1613f8a 100755 --- a/t/t1508-at-combinations.sh +++ b/t/t1508-at-combinations.sh @@ -55,6 +55,8 @@ 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}" |