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>
This commit is contained in:
Christian Couder
2009-03-30 06:59:59 +02:00
committed by Junio C Hamano
parent 37c4c38d73
commit e89aa6d2f5
4 changed files with 23 additions and 25 deletions

View File

@ -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