git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
7a8f796251ee7bf9b4b4c29530d3ff3e269be1c2 blob 5168 bytes (raw)

  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
 
#!/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-{old,good}=<term> --term-{new,bad}=<term>]
		 [--no-checkout] [<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

_x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
TERM_BAD=bad
TERM_GOOD=good

bisect_skip() {
	all=''
	for arg in "$@"
	do
		case "$arg" in
		*..*)
			revs=$(git rev-list "$arg") || die "$(eval_gettext "Bad rev input: \$arg")" ;;
		*)
			revs=$(git rev-parse --sq-quote "$arg") ;;
		esac
		all="$all $revs"
	done
	eval git bisect--helper --bisect-state 'skip' $all
}

bisect_visualize() {
	git bisect--helper --bisect-next-check $TERM_GOOD $TERM_BAD fail || exit

	if test $# = 0
	then
		if test -n "${DISPLAY+set}${SESSIONNAME+set}${MSYSTEM+set}${SECURITYSESSIONID+set}" &&
			type gitk >/dev/null 2>&1
		then
			set gitk
		else
			set git log
		fi
	else
		case "$1" in
		git*|tig) ;;
		-*)	set git log "$@" ;;
		*)	set git "$@" ;;
		esac
	fi

	eval '"$@"' --bisect -- $(cat "$GIT_DIR/BISECT_NAMES")
}

bisect_replay () {
	file="$1"
	test "$#" -eq 1 || die "$(gettext "No logfile given")"
	test -r "$file" || die "$(eval_gettext "cannot read \$file for replaying")"
	git bisect--helper --bisect-reset || exit
	oIFS="$IFS" IFS="$IFS$(printf '\015')"
	while read git bisect command rev tail
	do
		test "$git $bisect" = "git bisect" || test "$git" = "git-bisect" || continue
		if test "$git" = "git-bisect"
		then
			rev="$command"
			command="$bisect"
		fi
		get_terms
		git bisect--helper --check-and-set-terms "$command" "$TERM_GOOD" "$TERM_BAD" || exit
		get_terms
		case "$command" in
		start)
			eval "git bisect--helper --bisect-start $rev $tail" ;;
		"$TERM_GOOD"|"$TERM_BAD"|skip)
			git bisect--helper --bisect-write "$command" "$rev" "$TERM_GOOD" "$TERM_BAD" || exit;;
		terms)
			git bisect--helper --bisect-terms $rev || exit;;
		*)
			die "$(gettext "?? what are you talking about?")" ;;
		esac
	done <"$file"
	IFS="$oIFS"
	git bisect--helper --bisect-auto-next
}

bisect_run () {
	git bisect--helper --bisect-next-check $TERM_GOOD $TERM_BAD fail || exit

	test -n "$*" || die "$(gettext "bisect run failed: no command provided.")"

	while true
	do
		command="$@"
		eval_gettextln "running \$command"
		"$@"
		res=$?

		# Check for really bad run error.
		if [ $res -lt 0 -o $res -ge 128 ]
		then
			eval_gettextln "bisect run failed:
exit code \$res from '\$command' is < 0 or >= 128" >&2
			exit $res
		fi

		# Find current state depending on run success or failure.
		# A special exit code of 125 means cannot test.
		if [ $res -eq 125 ]
		then
			state='skip'
		elif [ $res -gt 0 ]
		then
			state="$TERM_BAD"
		else
			state="$TERM_GOOD"
		fi

		git bisect--helper --bisect-state $state >"$GIT_DIR/BISECT_RUN"
		res=$?

		cat "$GIT_DIR/BISECT_RUN"

		if sane_grep "first $TERM_BAD commit could be any of" "$GIT_DIR/BISECT_RUN" \
			>/dev/null
		then
			gettextln "bisect run cannot continue any more" >&2
			exit $res
		fi

		if [ $res -ne 0 ]
		then
			eval_gettextln "bisect run failed:
'git bisect--helper --bisect-state \$state' exited with error code \$res" >&2
			exit $res
		fi

		if sane_grep "is the first $TERM_BAD commit" "$GIT_DIR/BISECT_RUN" >/dev/null
		then
			gettextln "bisect run success"
			exit 0;
		fi

	done
}

bisect_log () {
	test -s "$GIT_DIR/BISECT_LOG" || die "$(gettext "We are not bisecting.")"
	cat "$GIT_DIR/BISECT_LOG"
}

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 ;;
	start)
		git bisect--helper --bisect-start "$@" ;;
	bad|good|new|old|"$TERM_BAD"|"$TERM_GOOD")
		git bisect--helper --bisect-state "$cmd" "$@" ;;
	skip)
		bisect_skip "$@" ;;
	next)
		# Not sure we want "next" at the UI level anymore.
		git bisect--helper --bisect-next "$@" || exit ;;
	visualize|view)
		bisect_visualize "$@" ;;
	reset)
		git bisect--helper --bisect-reset "$@" ;;
	replay)
		bisect_replay "$@" ;;
	log)
		bisect_log ;;
	run)
		bisect_run "$@" ;;
	terms)
		git bisect--helper --bisect-terms "$@" || exit;;
	*)
		usage ;;
	esac
esac
debug log:

solving 7a8f796251 ...
found 7a8f796251 in https://public-inbox.org/git/20200831105043.97665-11-mirucam@gmail.com/ ||
	https://public-inbox.org/git/20200828124617.60618-11-mirucam@gmail.com/ ||
	https://public-inbox.org/git/20200717105406.82226-11-mirucam@gmail.com/ ||
	https://public-inbox.org/git/20200701133504.18360-11-mirucam@gmail.com/
found 356264caf0 in https://public-inbox.org/git/20200831105043.97665-8-mirucam@gmail.com/ ||
	https://public-inbox.org/git/20200828124617.60618-8-mirucam@gmail.com/
found 59424f5b37 in https://public-inbox.org/git/20200828124617.60618-7-mirucam@gmail.com/ ||
	https://public-inbox.org/git/20200831105043.97665-7-mirucam@gmail.com/
found 9ca583d964 in https://public-inbox.org/git/20200831105043.97665-5-mirucam@gmail.com/ ||
	https://public-inbox.org/git/20200828124617.60618-5-mirucam@gmail.com/
found c7580e51a0 in git.git.git
preparing index
index prepared:
100755 c7580e51a0f9953b2a68296fedbd3cfe2f7c05e6	git-bisect.sh

applying [1/10] https://public-inbox.org/git/20200831105043.97665-5-mirucam@gmail.com/
diff --git a/git-bisect.sh b/git-bisect.sh
index c7580e51a0..9ca583d964 100755

Checking patch git-bisect.sh...
Applied patch git-bisect.sh cleanly.

skipping https://public-inbox.org/git/20200828124617.60618-5-mirucam@gmail.com/ for 9ca583d964
index at:
100755 9ca583d9643e2b8dbd4c0f7f1a9283fe043950ab	git-bisect.sh

applying [2/10] https://public-inbox.org/git/20200828124617.60618-7-mirucam@gmail.com/
diff --git a/git-bisect.sh b/git-bisect.sh
index 9ca583d964..59424f5b37 100755

Checking patch git-bisect.sh...
Applied patch git-bisect.sh cleanly.

skipping https://public-inbox.org/git/20200831105043.97665-7-mirucam@gmail.com/ for 59424f5b37
index at:
100755 59424f5b3743baa5e9ca591fbd878e413672467d	git-bisect.sh

applying [3/10] https://public-inbox.org/git/20200831105043.97665-8-mirucam@gmail.com/
diff --git a/git-bisect.sh b/git-bisect.sh
index 59424f5b37..356264caf0 100755

Checking patch git-bisect.sh...
Applied patch git-bisect.sh cleanly.

skipping https://public-inbox.org/git/20200828124617.60618-8-mirucam@gmail.com/ for 356264caf0
index at:
100755 356264caf01d249047cdca17d6d14e0a389ecd55	git-bisect.sh

applying [4/10] https://public-inbox.org/git/20200831105043.97665-11-mirucam@gmail.com/
diff --git a/git-bisect.sh b/git-bisect.sh
index 356264caf0..7a8f796251 100755

Checking patch git-bisect.sh...
Applied patch git-bisect.sh cleanly.

skipping https://public-inbox.org/git/20200828124617.60618-11-mirucam@gmail.com/ for 7a8f796251
skipping https://public-inbox.org/git/20200717105406.82226-11-mirucam@gmail.com/ for 7a8f796251
skipping https://public-inbox.org/git/20200701133504.18360-11-mirucam@gmail.com/ for 7a8f796251
index at:
100755 7a8f796251ee7bf9b4b4c29530d3ff3e269be1c2	git-bisect.sh

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).