global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-04-11 01:10:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Teach @{-1} to git merge

Browse Source 
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>
This commit is contained in:
Junio C Hamano
2009-02-13 23:26:12 -08:00
parent 8415d5c7ef
commit c9717ee970
2 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
t/t0100-previous.sh
View File

@@ -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