undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'cc/maint-1.6.0-bisect-fix'

Browse Source 
* 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:
Junio C Hamano 2009-02-27 01:03:21 -08:00
commit 0c34735616
2 changed files with 66 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
git-bisect.sh
View File

@ -290,48 +290,52 @@ filter_skipped() {
# Let's parse the output of: # Let's parse the output of:
# "git rev-list --bisect-vars --bisect-all ..." # "git rev-list --bisect-vars --bisect-all ..."
eval "$_eval" | while read hash line eval "$_eval" | {
VARS= FOUND= TRIED=
while read hash line
do do
case "$VARS,$FOUND,$TRIED,$hash" in case "$VARS,$FOUND,$TRIED,$hash" in
# We display some vars. 1,*,*,*)
1,*,*,*) echo "$hash $line" ;; # "bisect_foo=bar" read from rev-list output.
echo "$hash &&"
# Split line. ;;
,*,*,---*) ;; ,*,*,---*)
# Separator
# We had nothing to search. ;;
,,,bisect_rev*) ,,,bisect_rev*)
echo "bisect_rev=" # We had nothing to search.
echo "bisect_rev= &&"
VARS=1 VARS=1
;; ;;
,,*,bisect_rev*)
# We did not find a good bisect rev. # We did not find a good bisect rev.
# This should happen only if the "bad" # This should happen only if the "bad"
# commit is also a "skip" commit. # commit is also a "skip" commit.
,,*,bisect_rev*) echo "bisect_rev='$TRIED' &&"
echo "bisect_rev=$TRIED"
VARS=1 VARS=1
;; ;;
# We are searching.
,,*,*) ,,*,*)
# We are searching.
TRIED="${TRIED:+$TRIED|}$hash" TRIED="${TRIED:+$TRIED|}$hash"
case "$_skip" in case "$_skip" in
*$hash*) ;; *$hash*) ;;
*) *)
echo "bisect_rev=$hash" echo "bisect_rev=$hash &&"
echo "bisect_tried=\"$TRIED\"" echo "bisect_tried='$TRIED' &&"
FOUND=1 FOUND=1
;; ;;
esac esac
;; ;;
,1,*,bisect_rev*)
# We have already found a rev to be tested. # We have already found a rev to be tested.
,1,*,bisect_rev*) VARS=1 ;; VARS=1
,1,*,*) ;; ;;
,1,*,*)
# ??? ;;
*) die "filter_skipped error " \ *)
# Unexpected input
echo "die 'filter_skipped error'"
die "filter_skipped error " \
"VARS: '$VARS' " \ "VARS: '$VARS' " \
"FOUND: '$FOUND' " \ "FOUND: '$FOUND' " \
"TRIED: '$TRIED' " \ "TRIED: '$TRIED' " \
@ -340,6 +344,8 @@ filter_skipped() {
;; ;;
esac esac
done done
echo ':'
}
} }
exit_if_skipped_commits () { exit_if_skipped_commits () {

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

@ -224,6 +224,31 @@ test_expect_success 'bisect skip: cannot tell between 2 commits' '
fi 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 # We want to automatically find the commit that
# introduced "Another" into hello. # introduced "Another" into hello.
test_expect_success \ test_expect_success \