[PATCH 3/3] pull: propagate --progress to merge
- From
Jeff King <peff@peff.net>
- Date
- Feb 20, 2011, 09:56 UTC
- Message-ID
- <20110220095655.GC1082@sigill.intra.peff.net>
- In-Reply-To
- <20110220094803.GA988@sigill.intra.peff.net>
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> --- Probably not a big deal, but good for people who do "git pull --no-progress" from a cronjob (which should be !isatty(2), but ISTR some complaints by people with weird setups).
Fetch respects --no-progress, but I don't think it actually works right. The transport code seems to only understand "want progress" or "don't know, guess on isatty". But it's not really related to this topic, so I didn't investigate too far tonight.
git-pull.sh | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/git-pull.sh b/git-pull.sh index f6b7b84..63b063a 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -53,6 +53,8 @@ do verbosity="$verbosity -v" ;; --progress) progress=--progress ;; + --no-progress) + progress=--no-progress ;; -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="$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"
-- 1.7.4.1.26.g5e991