{"thread":{"id":"16225","subject":"[PATCH 7/7 v3] bisect: use \"--bisect-replace\" options when checking merge bases","startedAt":"2008-11-08T07:52:37Z","lastAt":"2008-11-08T07:52:37Z","messageCount":1,"participants":["Christian Couder"],"isPatch":true,"patchVersion":3,"patchTotal":7},"messages":[{"id":"95201","messageId":"20081108085237.a5df712e.chriscool@tuxfamily.org","threadId":"16225","inReplyTo":null,"subject":"[PATCH 7/7 v3] bisect: use \"--bisect-replace\" options when checking merge bases","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2008-11-08T07:52:37Z","receivedAt":"2008-11-08T07:52:37Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"Signed-off-by: Christian Couder <chriscool@tuxfamily.org>\n---\n git-bisect.sh |    4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/git-bisect.sh b/git-bisect.sh\nindex 1daa81c..87e186f 100755\n--- a/git-bisect.sh\n+++ b/git-bisect.sh\n@@ -401,7 +401,7 @@ check_merge_bases() {\n \t_bad=\"$1\"\n \t_good=\"$2\"\n \t_skip=\"$3\"\n-\tfor _mb in $(git merge-base --all $_bad $_good)\n+\tfor _mb in $(git merge-base --all --bisect-replace $_bad $_good)\n \tdo\n \t\tif is_among \"$_mb\" \"$_good\"; then\n \t\t\tcontinue\n@@ -436,7 +436,7 @@ check_good_are_ancestors_of_bad() {\n \t# Bisecting with no good rev is ok\n \ttest -z \"$_good\" && return\n \n-\t_side=$(git rev-list $_good ^$_bad)\n+\t_side=$(git rev-list --bisect-replace $_good ^$_bad)\n \tif test -n \"$_side\"; then\n \t\t# Return if a checkout was done\n \t\tcheck_merge_bases \"$_bad\" \"$_good\" \"$_skip\" || return\n-- \n1.6.0.3.619.g9a6a\n"}]}