mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
![Đoàn Trần Công Danh](/assets/img/avatar_default.png)
As of it is, we're parsing subcommand with OPT_CMDMODE, which will continue to parse more options even if the command has been found. When we're running "git bisect run" with a command that expecting a "--log" or "--no-log" arguments, or one of those "--bisect-..." arguments, bisect--helper may mistakenly think those options are bisect--helper's option. We may fix those problems by passing "--" when calling from git-bisect.sh, and skip that "--" in bisect--helper. However, it may interfere with user's "--". Let's parse subcommand with OPT_SUBCOMMAND since that API was born for this specific use-case. Reported-by: Lukáš Doktor <ldoktor@redhat.com> Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> Signed-off-by: Taylor Blau <me@ttaylorr.com>
68 lines
1.6 KiB
Bash
Executable file
68 lines
1.6 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
USAGE='[help|start|bad|good|new|old|terms|skip|next|reset|visualize|view|replay|log|run]'
|
|
LONG_USAGE='git bisect help
|
|
print this long help message.
|
|
git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>]
|
|
[--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]
|
|
reset bisect state and start bisection.
|
|
git bisect (bad|new) [<rev>]
|
|
mark <rev> a known-bad revision/
|
|
a revision after change in a given property.
|
|
git bisect (good|old) [<rev>...]
|
|
mark <rev>... known-good revisions/
|
|
revisions before change in a given property.
|
|
git bisect terms [--term-good | --term-bad]
|
|
show the terms used for old and new commits (default: bad, good)
|
|
git bisect skip [(<rev>|<range>)...]
|
|
mark <rev>... untestable revisions.
|
|
git bisect next
|
|
find next bisection to test and check it out.
|
|
git bisect reset [<commit>]
|
|
finish bisection search and go back to commit.
|
|
git bisect (visualize|view)
|
|
show bisect status in gitk.
|
|
git bisect replay <logfile>
|
|
replay bisection log.
|
|
git bisect log
|
|
show bisect log.
|
|
git bisect run <cmd>...
|
|
use <cmd>... to automatically bisect.
|
|
|
|
Please use "git help bisect" to get the full man page.'
|
|
|
|
OPTIONS_SPEC=
|
|
. git-sh-setup
|
|
|
|
TERM_BAD=bad
|
|
TERM_GOOD=good
|
|
|
|
get_terms () {
|
|
if test -s "$GIT_DIR/BISECT_TERMS"
|
|
then
|
|
{
|
|
read TERM_BAD
|
|
read TERM_GOOD
|
|
} <"$GIT_DIR/BISECT_TERMS"
|
|
fi
|
|
}
|
|
|
|
case "$#" in
|
|
0)
|
|
usage ;;
|
|
*)
|
|
cmd="$1"
|
|
get_terms
|
|
shift
|
|
case "$cmd" in
|
|
help)
|
|
git bisect -h ;;
|
|
bad|good|new|old|"$TERM_BAD"|"$TERM_GOOD")
|
|
git bisect--helper state "$cmd" "$@" ;;
|
|
log)
|
|
git bisect--helper log || exit ;;
|
|
*)
|
|
git bisect--helper "$cmd" "$@" ;;
|
|
esac
|
|
esac
|