mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: at-combinations: check ref names directly

Browse Source 
Some committishes might point to the same commit, but through a
different ref, that's why it's better to check directly for the ref,
rather than the commit message.

We can do that by calling rev-parse --symbolic-full-name, and to
differentiate the old from the new behavior we add an extra argument to
the check() helper.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Felipe Contreras 2013-05-07 16:55:02 -05:00 committed by Junio C Hamano
parent 1bc6d022b7
commit c8a81e90ac
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
t/t1508-at-combinations.sh
View File

@ -4,17 +4,24 @@ test_description='test various @{X} syntax combinations together'
. ./test-lib.sh . ./test-lib.sh
check() { check() {
test_expect_${3:-success} "$1 = $2" " test_expect_${4:-success} "$1 = $3" "
echo '$2' >expect && echo '$3' >expect &&
git log -1 --format=%s '$1' >actual && if test '$2' = 'commit'
test_cmp expect actual then
" git log -1 --format=%s '$1' >actual
else
git rev-parse --symbolic-full-name '$1' >actual
fi &&
test_cmp expect actual
"
} }
nonsense() { nonsense() {
test_expect_${2:-success} "$1 is nonsensical" " test_expect_${2:-success} "$1 is nonsensical" "
test_must_fail git log -1 '$1' test_must_fail git log -1 '$1'
" "
} }
fail() { fail() {
"$@" failure "$@" failure
} }
@ -35,14 +42,14 @@ test_expect_success 'setup' '
git branch -u upstream-branch new-branch git branch -u upstream-branch new-branch
' '
check HEAD new-two check HEAD ref refs/heads/new-branch
check "@{1}" new-one check "@{1}" commit new-one
check "@{-1}" old-two check "@{-1}" ref refs/heads/old-branch
check "@{-1}@{1}" old-one check "@{-1}@{1}" commit old-one
check "@{u}" upstream-two check "@{u}" ref refs/heads/upstream-branch
check "@{u}@{1}" upstream-one check "@{u}@{1}" commit upstream-one
check "@{-1}@{u}" master-two check "@{-1}@{u}" ref refs/heads/master
check "@{-1}@{u}@{1}" master-one check "@{-1}@{u}@{1}" commit master-one
nonsense "@{u}@{-1}" nonsense "@{u}@{-1}"
nonsense "@{1}@{u}" nonsense "@{1}@{u}"