X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-pull.sh;h=1a4729f7bb29205fb7bc251887dcd4f5237f1659;hb=da288e25d9e10b746cf3b311cb4503d1810cde37;hp=38331a861106c63bf5f421dbe03f4aafe949812e;hpb=f3604763ba0355f628cf815cfaf4fec20d46e958;p=git.git

diff --git a/git-pull.sh b/git-pull.sh
index 38331a861..1a4729f7b 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -38,10 +38,10 @@ test -z "$(git ls-files -u)" || die_conflict
 test -f "$GIT_DIR/MERGE_HEAD" && die_merge
 
 strategy_args= diffstat= no_commit= squash= no_ff= ff_only=
-log_arg= verbosity=
+log_arg= verbosity= progress=
 merge_args=
 curr_branch=$(git symbolic-ref -q HEAD)
-curr_branch_short=$(echo "$curr_branch" | sed "s|refs/heads/||")
+curr_branch_short="${curr_branch#refs/heads/}"
 rebase=$(git config --bool branch.$curr_branch_short.rebase)
 while :
 do
@@ -50,6 +50,8 @@ do
 		verbosity="$verbosity -q" ;;
 	-v|--verbose)
 		verbosity="$verbosity -v" ;;
+	--progress)
+		progress=--progress ;;
 	-n|--no-stat|--no-summary)
 		diffstat=--no-stat ;;
 	--stat|--summary)
@@ -214,7 +216,7 @@ test true = "$rebase" && {
 	done
 }
 orig_head=$(git rev-parse -q --verify HEAD)
-git fetch $verbosity --update-head-ok "$@" || exit 1
+git fetch $verbosity $progress --update-head-ok "$@" || exit 1
 
 curr_head=$(git rev-parse -q --verify HEAD)
 if test -n "$orig_head" && test "$curr_head" != "$orig_head"