diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-06-01 03:16:48 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-06-01 03:16:48 +0400 |
commit | 1136e2c6426f736fd4fde6d4cf901e8b192ab30b (patch) | |
tree | aeedfae91a978000c93ab98a518bb1a7b431ec54 /t | |
parent | 6e4f981ffb88c8a9d3d6128314f4dd4f54ffb8a8 (diff) | |
parent | 2d938fc7bcf2c8ce314c44955db5a4dd2e9b6adb (diff) |
Merge branch 'cc/bisect' (early part)
* 'cc/bisect' (early part):
bisect: check ancestors without forking a "git rev-list" process
commit: add function to unparse a commit and its parents
bisect: rework some rev related functions to make them more reusable
Diffstat (limited to 't')
-rwxr-xr-x | t/t6030-bisect-porcelain.sh | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index 54b7ea6505..5254b23512 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -482,28 +482,17 @@ test_expect_success 'good merge bases when good and bad are siblings' ' git bisect reset ' -check_trace() { - grep "$1" "$GIT_TRACE" | grep "\^$2" | grep "$3" >/dev/null -} - test_expect_success 'optimized merge base checks' ' - GIT_TRACE="$(pwd)/trace.log" && - export GIT_TRACE && git bisect start "$HASH7" "$SIDE_HASH7" > my_bisect_log.txt && grep "merge base must be tested" my_bisect_log.txt && grep "$HASH4" my_bisect_log.txt && - check_trace "rev-list" "$HASH7" "$SIDE_HASH7" && git bisect good > my_bisect_log2.txt && test -f ".git/BISECT_ANCESTORS_OK" && test "$HASH6" = $(git rev-parse --verify HEAD) && - : > "$GIT_TRACE" && git bisect bad > my_bisect_log3.txt && - test_must_fail check_trace "rev-list" "$HASH6" "$SIDE_HASH7" && git bisect good "$A_HASH" > my_bisect_log4.txt && grep "merge base must be tested" my_bisect_log4.txt && - test_must_fail test -f ".git/BISECT_ANCESTORS_OK" && - check_trace "rev-list" "$HASH6" "$A_HASH" && - unset GIT_TRACE + test_must_fail test -f ".git/BISECT_ANCESTORS_OK" ' # This creates another side branch called "parallel" with some files |