diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2013-09-02 01:34:30 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-12 14:39:34 -0700 |
| commit | 9ba89f484e023827eca6ad44baf69af37dac4db3 (patch) | |
| tree | 412e36de2f9e033c1705bed8d21ed7aac3ad379f /t/t1508-at-combinations.sh | |
| parent | cf99a761d3903dbaf8265f60da9eaee6a15a6fe6 (diff) | |
| download | git-9ba89f484e023827eca6ad44baf69af37dac4db3.tar.gz | |
Add new @ shortcut for HEADfc/at-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 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t1508-at-combinations.sh b/t/t1508-at-combinations.sh index e5aea3b896..ceb844985f 100755 --- a/t/t1508-at-combinations.sh +++ b/t/t1508-at-combinations.sh @@ -32,6 +32,9 @@ test_expect_success 'setup' ' git checkout -b upstream-branch && test_commit upstream-one && test_commit upstream-two && + git checkout -b @/at-test && + git checkout -b @@/at-test && + git checkout -b @at-test && git checkout -b old-branch && test_commit old-one && test_commit old-two && @@ -55,6 +58,11 @@ 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 +check "@@/at-test" ref refs/heads/@@/at-test +check "@/at-test" ref refs/heads/@/at-test +check "@at-test" ref refs/heads/@at-test nonsense "@{u}@{-1}" nonsense "@{0}@{0}" nonsense "@{1}@{u}" |