mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'ar/test-cleanup'
Test clean-up. * ar/test-cleanup: t7527: use test_when_finished in 'case insensitive+preserving' t6422: drop commented out code t6003: uncomment test '--max-age=c3, --topo-order'
This commit is contained in:
commit
013f168211
|
@ -326,19 +326,16 @@ a2
|
|||
c3
|
||||
EOF
|
||||
|
||||
#
|
||||
# this test fails on --topo-order - a fix is required
|
||||
#
|
||||
#test_output_expect_success '--max-age=c3, --topo-order' "git rev-list --topo-order --max-age=$(commit_date c3) l5" <<EOF
|
||||
#l5
|
||||
#l4
|
||||
#l3
|
||||
#a4
|
||||
#c3
|
||||
#b4
|
||||
#a3
|
||||
#a2
|
||||
#EOF
|
||||
test_output_expect_success '--max-age=c3, --topo-order' "git rev-list --topo-order --max-age=$(commit_date c3) l5" <<EOF
|
||||
l5
|
||||
l4
|
||||
l3
|
||||
a4
|
||||
c3
|
||||
b4
|
||||
a3
|
||||
a2
|
||||
EOF
|
||||
|
||||
test_output_expect_success 'one specified head reachable from another a4, c3, --topo-order' "list_duplicates git rev-list --topo-order a4 c3" <<EOF
|
||||
EOF
|
||||
|
|
|
@ -1159,7 +1159,6 @@ test_conflicts_with_adds_and_renames() {
|
|||
# 4) There should not be any three~* files in the working
|
||||
# tree
|
||||
test_setup_collision_conflict () {
|
||||
#test_expect_success "setup simple $sideL/$sideR conflict" '
|
||||
git init simple_${sideL}_${sideR} &&
|
||||
(
|
||||
cd simple_${sideL}_${sideR} &&
|
||||
|
@ -1236,7 +1235,6 @@ test_conflicts_with_adds_and_renames() {
|
|||
fi &&
|
||||
test_tick && git commit -m R
|
||||
)
|
||||
#'
|
||||
}
|
||||
|
||||
test_expect_success "check simple $sideL/$sideR conflict" '
|
||||
|
|
|
@ -910,7 +910,7 @@ test_expect_success "submodule absorbgitdirs implicitly starts daemon" '
|
|||
# the file/directory.
|
||||
#
|
||||
test_expect_success CASE_INSENSITIVE_FS 'case insensitive+preserving' '
|
||||
# test_when_finished "stop_daemon_delete_repo test_insensitive" &&
|
||||
test_when_finished "stop_daemon_delete_repo test_insensitive" &&
|
||||
|
||||
git init test_insensitive &&
|
||||
|
||||
|
|
Loading…
Reference in a new issue