global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-04-10 00:40:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cc/bisect' (early part)

Browse Source 
* '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
This commit is contained in:
Junio C Hamano
2009-05-31 16:16:48 -07:00
parent 6e4f981ffb 2d938fc7bc
commit 1136e2c642
4 changed files with 59 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
t/t6030-bisect-porcelain.sh
View File

@@ -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