pull: propagate --progress to merge

Now that merge understands progress, we should pass it
along. While we're at it, pass along --no-progress, too.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-pull.sh b/git-pull.sh
index eb87f49062b70d707adebca4013809822123608b..5e8215ca74c01460f848f957253f2836ba5c1e9c 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -53,6 +53,8 @@ do
                verbosity="$verbosity -v" ;;
        --progress)
                progress=--progress ;;
                verbosity="$verbosity -v" ;;
        --progress)
                progress=--progress ;;

+       --no-progress)
+               progress=--no-progress ;;

        -n|--no-stat|--no-summary)
                diffstat=--no-stat ;;
        --stat|--summary)
        -n|--no-stat|--no-summary)
                diffstat=--no-stat ;;
        --stat|--summary)


@@ -293,8 +295,8 @@ true)
        ;;
 *)
        eval="git-merge $diffstat $no_commit $squash $no_ff $ff_only"
        ;;
 *)
        eval="git-merge $diffstat $no_commit $squash $no_ff $ff_only"

-       eval="$eval  $log_arg $strategy_args $merge_args"
-       eval="$eval \"\$merge_name\" HEAD $merge_head $verbosity"
+       eval="$eval  $log_arg $strategy_args $merge_args $verbosity $progress"
+       eval="$eval \"\$merge_name\" HEAD $merge_head"

        ;;
 esac
 eval "exec $eval"
        ;;
 esac
 eval "exec $eval"