Skip to main content

Browse the archive

Revision 53b3c47d64b4294ae586d1daa04f9140dadd9ae6 authored by Michael J Gruber on 15 April 2010, 09:34:07 UTC, committed by Junio C Hamano on 17 April 2010, 17:30:00 UTC 
t1010-mktree: Adjust expected result to code and documentation
 
The last two tests here were always supposed to fail in the sense
that, according to code and documentation, mktree should read non-recursive
ls-tree output, but not recursive one, and therefore explicitely refuses
to deal with slashes.

Adjust the test (must_fail) so that it succeeds when mktree dies on
slashes.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 2179870
Raw File
t1505-rev-parse-last.sh 
#!/bin/sh

test_description='test @{-N} syntax'

. ./test-lib.sh


make_commit () {
	echo "$1" > "$1" &&
	git add "$1" &&
	git commit -m "$1"
}


test_expect_success 'setup' '

	make_commit 1 &&
	git branch side &&
	make_commit 2 &&
	make_commit 3 &&
	git checkout side &&
	make_commit 4 &&
	git merge master &&
	git checkout master

'

# 1 -- 2 -- 3 master
#  \         \
#   \         \
#    --- 4 --- 5 side
#
# and 'side' should be the last branch

test_rev_equivalent () {

	git rev-parse "$1" > expect &&
	git rev-parse "$2" > output &&
	test_cmp expect output

}

test_expect_success '@{-1} works' '
	test_rev_equivalent side @{-1}
'

test_expect_success '@{-1}~2 works' '
	test_rev_equivalent side~2 @{-1}~2
'

test_expect_success '@{-1}^2 works' '
	test_rev_equivalent side^2 @{-1}^2
'

test_expect_success '@{-1}@{1} works' '
	test_rev_equivalent side@{1} @{-1}@{1}
'

test_expect_success '@{-2} works' '
	test_rev_equivalent master @{-2}
'

test_expect_success '@{-3} fails' '
	test_must_fail git rev-parse @{-3}
'

test_done
back to top