bisect: move argument parsing before state modification.
Currently 'git bisect start' modifies some state prior to checking that its arguments are valid. This change moves argument validation before state modification with the effect that state modification does not occur unless argument validations succeeds. An existing test is changed to check that new bisect state is not created if arguments are invalid. A new test is added to check that existing bisect state is not modified if arguments are invalid. Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
b35acb5345
commit
4764f46492
@ -59,6 +59,39 @@ bisect_autostart() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
bisect_start() {
|
bisect_start() {
|
||||||
|
#
|
||||||
|
# Check for one bad and then some good revisions.
|
||||||
|
#
|
||||||
|
has_double_dash=0
|
||||||
|
for arg; do
|
||||||
|
case "$arg" in --) has_double_dash=1; break ;; esac
|
||||||
|
done
|
||||||
|
orig_args=$(git rev-parse --sq-quote "$@")
|
||||||
|
bad_seen=0
|
||||||
|
eval=''
|
||||||
|
while [ $# -gt 0 ]; do
|
||||||
|
arg="$1"
|
||||||
|
case "$arg" in
|
||||||
|
--)
|
||||||
|
shift
|
||||||
|
break
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
rev=$(git rev-parse -q --verify "$arg^{commit}") || {
|
||||||
|
test $has_double_dash -eq 1 &&
|
||||||
|
die "$(eval_gettext "'\$arg' does not appear to be a valid revision")"
|
||||||
|
break
|
||||||
|
}
|
||||||
|
case $bad_seen in
|
||||||
|
0) state='bad' ; bad_seen=1 ;;
|
||||||
|
*) state='good' ;;
|
||||||
|
esac
|
||||||
|
eval="$eval bisect_write '$state' '$rev' 'nolog'; "
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
#
|
#
|
||||||
# Verify HEAD.
|
# Verify HEAD.
|
||||||
#
|
#
|
||||||
@ -97,39 +130,6 @@ bisect_start() {
|
|||||||
#
|
#
|
||||||
bisect_clean_state || exit
|
bisect_clean_state || exit
|
||||||
|
|
||||||
#
|
|
||||||
# Check for one bad and then some good revisions.
|
|
||||||
#
|
|
||||||
has_double_dash=0
|
|
||||||
for arg; do
|
|
||||||
case "$arg" in --) has_double_dash=1; break ;; esac
|
|
||||||
done
|
|
||||||
orig_args=$(git rev-parse --sq-quote "$@")
|
|
||||||
bad_seen=0
|
|
||||||
eval=''
|
|
||||||
while [ $# -gt 0 ]; do
|
|
||||||
arg="$1"
|
|
||||||
case "$arg" in
|
|
||||||
--)
|
|
||||||
shift
|
|
||||||
break
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
rev=$(git rev-parse -q --verify "$arg^{commit}") || {
|
|
||||||
test $has_double_dash -eq 1 &&
|
|
||||||
die "$(eval_gettext "'\$arg' does not appear to be a valid revision")"
|
|
||||||
break
|
|
||||||
}
|
|
||||||
case $bad_seen in
|
|
||||||
0) state='bad' ; bad_seen=1 ;;
|
|
||||||
*) state='good' ;;
|
|
||||||
esac
|
|
||||||
eval="$eval bisect_write '$state' '$rev' 'nolog'; "
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Change state.
|
# Change state.
|
||||||
# In case of mistaken revs or checkout error, or signals received,
|
# In case of mistaken revs or checkout error, or signals received,
|
||||||
|
@ -138,15 +138,23 @@ test_expect_success 'bisect start: back in good branch' '
|
|||||||
grep "* other" branch.output > /dev/null
|
grep "* other" branch.output > /dev/null
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'bisect start: no ".git/BISECT_START" if junk rev' '
|
test_expect_success 'bisect start: no ".git/BISECT_START" created if junk rev' '
|
||||||
git bisect start $HASH4 $HASH1 -- &&
|
git bisect reset &&
|
||||||
git bisect good &&
|
|
||||||
test_must_fail git bisect start $HASH4 foo -- &&
|
test_must_fail git bisect start $HASH4 foo -- &&
|
||||||
git branch > branch.output &&
|
git branch > branch.output &&
|
||||||
grep "* other" branch.output > /dev/null &&
|
grep "* other" branch.output > /dev/null &&
|
||||||
test_must_fail test -e .git/BISECT_START
|
test_must_fail test -e .git/BISECT_START
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success 'bisect start: existing ".git/BISECT_START" not modified if junk rev' '
|
||||||
|
git bisect start $HASH4 $HASH1 -- &&
|
||||||
|
git bisect good &&
|
||||||
|
cp .git/BISECT_START saved &&
|
||||||
|
test_must_fail git bisect start $HASH4 foo -- &&
|
||||||
|
git branch > branch.output &&
|
||||||
|
grep "* (no branch)" branch.output > /dev/null &&
|
||||||
|
test_cmp saved .git/BISECT_START
|
||||||
|
'
|
||||||
test_expect_success 'bisect start: no ".git/BISECT_START" if mistaken rev' '
|
test_expect_success 'bisect start: no ".git/BISECT_START" if mistaken rev' '
|
||||||
git bisect start $HASH4 $HASH1 -- &&
|
git bisect start $HASH4 $HASH1 -- &&
|
||||||
git bisect good &&
|
git bisect good &&
|
||||||
|
Loading…
Reference in New Issue
Block a user