diff options
| author | Christian Couder <chriscool@tuxfamily.org> | 2009-03-30 04:59:59 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-05 08:29:45 (GMT) |
| commit | e89aa6d2f546b2d4f2d88c15ce7e343751d6922f (patch) | |
| tree | f387a8765ef8469baf6e047ca856bd428d20ff4f /git-bisect.sh | |
| parent | 37c4c38d7356bf256d0297fdbac78ef8b6807fac (diff) | |
| download | git-e89aa6d2f546b2d4f2d88c15ce7e343751d6922f.zip git-e89aa6d2f546b2d4f2d88c15ce7e343751d6922f.tar.gz git-e89aa6d2f546b2d4f2d88c15ce7e343751d6922f.tar.bz2 | |
bisect--helper: string output variables together with "&&"
When doing:
eval "git bisect--helper --next-vars" | {
while read line
do
echo "$line &&"
done
echo ':'
}
the result code comes from the last "echo ':'", not from running
"git bisect--helper --next-vars".
This patch gets rid of the need to string together the line from
the output of "git bisect--helper" with "&&" in the calling script
by making "git bisect--helper --next-vars" return output variables
already in that format.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-bisect.sh')
| -rwxr-xr-x | git-bisect.sh | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/git-bisect.sh b/git-bisect.sh index 0f7590d..5074dda 100755 --- a/git-bisect.sh +++ b/git-bisect.sh @@ -279,18 +279,6 @@ bisect_auto_next() { bisect_next_check && bisect_next || : } -eval_and_string_together() { - _eval="$1" - - eval "$_eval" | { - while read line - do - echo "$line &&" - done - echo ':' - } -} - exit_if_skipped_commits () { _tried=$1 _bad=$2 @@ -429,8 +417,7 @@ bisect_next() { test "$?" -eq "1" && return # Get bisection information - eval="git bisect--helper --next-vars" && - eval=$(eval_and_string_together "$eval") && + eval=$(eval "git bisect--helper --next-vars") && eval "$eval" || exit if [ -z "$bisect_rev" ]; then |