diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-02-14 10:26:12 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-02-14 10:46:42 +0300 |
commit | c9717ee97075bb333684fa2f63e9136c5f7d89bf (patch) | |
tree | 5adc2d2770b83a22020981cd389d1c171d1f3426 /t/t0100-previous.sh | |
parent | 8415d5c7ef63237f6efab0c9aef0b0fdbcbfda25 (diff) |
Teach @{-1} to git merge
1.6.2 will have @{-1} syntax advertised as "usable anywhere you can use
a branch name". However, "git merge @{-1}" did not work.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t0100-previous.sh')
-rwxr-xr-x | t/t0100-previous.sh | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/t/t0100-previous.sh b/t/t0100-previous.sh index db51b421d6..315b9b3f10 100755 --- a/t/t0100-previous.sh +++ b/t/t0100-previous.sh @@ -22,5 +22,28 @@ test_expect_success 'branch -d @{-12} when there is not enough switches yet' ' git rev-parse --verify refs/heads/master ' +test_expect_success 'merge @{-1}' ' + git checkout A && + test_commit B && + git checkout A && + test_commit C && + git branch -f master B && + git branch -f other && + git checkout other && + git checkout master && + git merge @{-1} && + git cat-file commit HEAD | grep "Merge branch '\''other'\''" +' + +test_expect_success 'merge @{-1} when there is not enough switches yet' ' + git reflog expire --expire=now && + git checkout -f master && + git reset --hard B && + git branch -f other C && + git checkout other && + git checkout master && + test_must_fail git merge @{-12} +' + test_done |