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>
Jeff King committed
Feb 20, 2011 at 04:56 UTC
bebd2fd77d385f198017fe297a6c79e26b2bf61c
1 file changed
+4
-2
git-pull.sh
+4
-2
@@ -53,6 +53,8 @@ do
53
verbosity="$verbosity -v" ;;
54
--progress)
55
progress=--progress ;;
56
+ --no-progress)
57
+ progress=--no-progress ;;
58
-n|--no-stat|--no-summary)
59
diffstat=--no-stat ;;
60
--stat|--summary)
@@ -293,8 +295,8 @@ true)
295
;;
296
*)
297
eval="git-merge $diffstat $no_commit $squash $no_ff $ff_only"
296
- eval="$eval $log_arg $strategy_args $merge_args"
297
- eval="$eval \"\$merge_name\" HEAD $merge_head $verbosity"
298
+ eval="$eval $log_arg $strategy_args $merge_args $verbosity $progress"
299
+ eval="$eval \"\$merge_name\" HEAD $merge_head"
300
;;
301
esac
302
eval "exec $eval"