mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'cc/maint-1.6.0-bisect-fix'
* cc/maint-1.6.0-bisect-fix: bisect: fix quoting TRIED revs when "bad" commit is also "skip"ped Conflicts: git-bisect.sh
This commit is contained in:
commit
0c34735616
|
@ -290,56 +290,62 @@ filter_skipped() {
|
|||
|
||||
# Let's parse the output of:
|
||||
# "git rev-list --bisect-vars --bisect-all ..."
|
||||
eval "$_eval" | while read hash line
|
||||
do
|
||||
case "$VARS,$FOUND,$TRIED,$hash" in
|
||||
# We display some vars.
|
||||
1,*,*,*) echo "$hash $line" ;;
|
||||
|
||||
# Split line.
|
||||
,*,*,---*) ;;
|
||||
|
||||
# We had nothing to search.
|
||||
eval "$_eval" | {
|
||||
VARS= FOUND= TRIED=
|
||||
while read hash line
|
||||
do
|
||||
case "$VARS,$FOUND,$TRIED,$hash" in
|
||||
1,*,*,*)
|
||||
# "bisect_foo=bar" read from rev-list output.
|
||||
echo "$hash &&"
|
||||
;;
|
||||
,*,*,---*)
|
||||
# Separator
|
||||
;;
|
||||
,,,bisect_rev*)
|
||||
echo "bisect_rev="
|
||||
# We had nothing to search.
|
||||
echo "bisect_rev= &&"
|
||||
VARS=1
|
||||
;;
|
||||
|
||||
# We did not find a good bisect rev.
|
||||
# This should happen only if the "bad"
|
||||
# commit is also a "skip" commit.
|
||||
,,*,bisect_rev*)
|
||||
echo "bisect_rev=$TRIED"
|
||||
# We did not find a good bisect rev.
|
||||
# This should happen only if the "bad"
|
||||
# commit is also a "skip" commit.
|
||||
echo "bisect_rev='$TRIED' &&"
|
||||
VARS=1
|
||||
;;
|
||||
|
||||
# We are searching.
|
||||
,,*,*)
|
||||
# We are searching.
|
||||
TRIED="${TRIED:+$TRIED|}$hash"
|
||||
case "$_skip" in
|
||||
*$hash*) ;;
|
||||
*)
|
||||
echo "bisect_rev=$hash"
|
||||
echo "bisect_tried=\"$TRIED\""
|
||||
echo "bisect_rev=$hash &&"
|
||||
echo "bisect_tried='$TRIED' &&"
|
||||
FOUND=1
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
||||
# We have already found a rev to be tested.
|
||||
,1,*,bisect_rev*) VARS=1 ;;
|
||||
,1,*,*) ;;
|
||||
|
||||
# ???
|
||||
*) die "filter_skipped error " \
|
||||
"VARS: '$VARS' " \
|
||||
"FOUND: '$FOUND' " \
|
||||
"TRIED: '$TRIED' " \
|
||||
"hash: '$hash' " \
|
||||
"line: '$line'"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
,1,*,bisect_rev*)
|
||||
# We have already found a rev to be tested.
|
||||
VARS=1
|
||||
;;
|
||||
,1,*,*)
|
||||
;;
|
||||
*)
|
||||
# Unexpected input
|
||||
echo "die 'filter_skipped error'"
|
||||
die "filter_skipped error " \
|
||||
"VARS: '$VARS' " \
|
||||
"FOUND: '$FOUND' " \
|
||||
"TRIED: '$TRIED' " \
|
||||
"hash: '$hash' " \
|
||||
"line: '$line'"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
echo ':'
|
||||
}
|
||||
}
|
||||
|
||||
exit_if_skipped_commits () {
|
||||
|
|
|
@ -224,6 +224,31 @@ test_expect_success 'bisect skip: cannot tell between 2 commits' '
|
|||
fi
|
||||
'
|
||||
|
||||
# $HASH1 is good, $HASH4 is both skipped and bad, we skip $HASH3
|
||||
# and $HASH2 is good,
|
||||
# so we should not be able to tell the first bad commit
|
||||
# among $HASH3 and $HASH4
|
||||
test_expect_success 'bisect skip: with commit both bad and skipped' '
|
||||
git bisect start &&
|
||||
git bisect skip &&
|
||||
git bisect bad &&
|
||||
git bisect good $HASH1 &&
|
||||
git bisect skip &&
|
||||
if git bisect good > my_bisect_log.txt
|
||||
then
|
||||
echo Oops, should have failed.
|
||||
false
|
||||
else
|
||||
test $? -eq 2 &&
|
||||
grep "first bad commit could be any of" my_bisect_log.txt &&
|
||||
! grep $HASH1 my_bisect_log.txt &&
|
||||
! grep $HASH2 my_bisect_log.txt &&
|
||||
grep $HASH3 my_bisect_log.txt &&
|
||||
grep $HASH4 my_bisect_log.txt &&
|
||||
git bisect reset
|
||||
fi
|
||||
'
|
||||
|
||||
# We want to automatically find the commit that
|
||||
# introduced "Another" into hello.
|
||||
test_expect_success \
|
||||
|
|
Loading…
Reference in a new issue