summaryrefslogtreecommitdiff
path: root/git-checkout.sh
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2007-04-23 17:17:19 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-04-24 04:39:28 (GMT)
commit4c474b6f92a2aa0b5aea282fe281e8f65279380a (patch)
tree9814bdeedd7a8dfe6c0f5d264f73e2b5aa772f4c /git-checkout.sh
parent2cc3167c688d1c91bc4cb9b1caa737b9d4971056 (diff)
downloadgit-4c474b6f92a2aa0b5aea282fe281e8f65279380a.zip
git-4c474b6f92a2aa0b5aea282fe281e8f65279380a.tar.gz
git-4c474b6f92a2aa0b5aea282fe281e8f65279380a.tar.bz2
add file checkout progress
It is nice to see what is happening when checking out large amount of files, either with git-checkout or git-reset. The new progress code already decides what is a "significant amount" and displays progress only in that case.. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-checkout.sh')
-rwxr-xr-xgit-checkout.sh8
1 files changed, 5 insertions, 3 deletions
diff --git a/git-checkout.sh b/git-checkout.sh
index deb0a9a..ed7c2c5 100755
--- a/git-checkout.sh
+++ b/git-checkout.sh
@@ -17,6 +17,7 @@ newbranch=
newbranch_log=
merge=
quiet=
+v=-v
LF='
'
while [ "$#" != "0" ]; do
@@ -47,6 +48,7 @@ while [ "$#" != "0" ]; do
;;
"-q")
quiet=1
+ v=
;;
--)
break
@@ -197,7 +199,7 @@ fi
if [ "$force" ]
then
- git-read-tree --reset -u $new
+ git-read-tree $v --reset -u $new
else
git-update-index --refresh >/dev/null
merge_error=$(git-read-tree -m -u --exclude-per-directory=.gitignore $old $new 2>&1) || (
@@ -210,7 +212,7 @@ else
# Match the index to the working tree, and do a three-way.
git diff-files --name-only | git update-index --remove --stdin &&
work=`git write-tree` &&
- git read-tree --reset -u $new || exit
+ git read-tree $v --reset -u $new || exit
eval GITHEAD_$new='${new_name:-${branch:-$new}}' &&
eval GITHEAD_$work=local &&
@@ -221,7 +223,7 @@ else
# this is not a real merge before committing, but just carrying
# the working tree changes along.
unmerged=`git ls-files -u`
- git read-tree --reset $new
+ git read-tree $v --reset $new
case "$unmerged" in
'') ;;
*)