2009-02-14 08:08:05 +01:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='previous branch syntax @{-n}'
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
test_expect_success 'branch -d @{-1}' '
|
|
|
|
test_commit A &&
|
|
|
|
git checkout -b junk &&
|
|
|
|
git checkout - &&
|
|
|
|
test "$(git symbolic-ref HEAD)" = refs/heads/master &&
|
|
|
|
git branch -d @{-1} &&
|
|
|
|
test_must_fail git rev-parse --verify refs/heads/junk
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'branch -d @{-12} when there is not enough switches yet' '
|
|
|
|
git reflog expire --expire=now &&
|
|
|
|
git checkout -b junk2 &&
|
|
|
|
git checkout - &&
|
|
|
|
test "$(git symbolic-ref HEAD)" = refs/heads/master &&
|
|
|
|
test_must_fail git branch -d @{-12} &&
|
|
|
|
git rev-parse --verify refs/heads/master
|
|
|
|
'
|
|
|
|
|
2009-02-14 08:26:12 +01:00
|
|
|
test_expect_success 'merge @{-1}' '
|
|
|
|
git checkout A &&
|
|
|
|
test_commit B &&
|
|
|
|
git checkout A &&
|
|
|
|
test_commit C &&
|
2013-05-15 23:32:30 +02:00
|
|
|
test_commit D &&
|
2009-02-14 08:26:12 +01:00
|
|
|
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'\''"
|
|
|
|
'
|
|
|
|
|
2013-05-15 23:32:30 +02:00
|
|
|
test_expect_success 'merge @{-1}~1' '
|
|
|
|
git checkout master &&
|
|
|
|
git reset --hard B &&
|
|
|
|
git checkout other &&
|
|
|
|
git checkout master &&
|
|
|
|
git merge @{-1}~1 &&
|
|
|
|
git cat-file commit HEAD >actual &&
|
|
|
|
grep "Merge branch '\''other'\''" actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'merge @{-100} before checking out that many branches yet' '
|
2009-02-14 08:26:12 +01:00
|
|
|
git reflog expire --expire=now &&
|
|
|
|
git checkout -f master &&
|
|
|
|
git reset --hard B &&
|
|
|
|
git branch -f other C &&
|
|
|
|
git checkout other &&
|
|
|
|
git checkout master &&
|
2013-05-15 23:32:30 +02:00
|
|
|
test_must_fail git merge @{-100}
|
2009-02-14 08:26:12 +01:00
|
|
|
'
|
|
|
|
|
2017-02-27 10:25:40 +01:00
|
|
|
test_expect_success 'log -g @{-1}' '
|
|
|
|
git checkout -b last_branch &&
|
|
|
|
git checkout -b new_branch &&
|
|
|
|
echo "last_branch@{0}" >expect &&
|
|
|
|
git log -g --format=%gd @{-1} >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2009-02-14 08:08:05 +01:00
|
|
|
test_done
|
|
|
|
|