kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Jeff King 2011-02-20 04:56:56 -05:00 committed by Junio C Hamano
parent 99bfc6691d
commit bebd2fd77d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-pull.sh
View File

@ -53,6 +53,8 @@ do
verbosity="$verbosity -v" ;; verbosity="$verbosity -v" ;;
--progress) --progress)
progress=--progress ;; progress=--progress ;;
--no-progress)
progress=--no-progress ;;
-n|--no-stat|--no-summary) -n|--no-stat|--no-summary)
diffstat=--no-stat ;; diffstat=--no-stat ;;
--stat|--summary) --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 $log_arg $strategy_args $merge_args $verbosity $progress"
eval="$eval \"\$merge_name\" HEAD $merge_head $verbosity" eval="$eval \"\$merge_name\" HEAD $merge_head"
;; ;;
esac esac
eval "exec $eval" eval "exec $eval"