Skip to content

Commit

Permalink
add file checkout progress
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Nicolas Pitre authored and Junio C Hamano committed Apr 24, 2007
1 parent 2cc3167 commit 4c474b6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 5 additions & 3 deletions git-checkout.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ newbranch=
newbranch_log=
merge=
quiet=
v=-v
LF='
'
while [ "$#" != "0" ]; do
Expand Down Expand Up @@ -47,6 +48,7 @@ while [ "$#" != "0" ]; do
;;
"-q")
quiet=1
v=
;;
--)
break
Expand Down Expand Up @@ -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) || (
Expand All @@ -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 &&
Expand All @@ -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
'') ;;
*)
Expand Down
2 changes: 1 addition & 1 deletion git-reset.sh
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ then
die "Cannot do a soft reset in the middle of a merge."
fi
else
git-read-tree --reset $update "$rev" || exit
git-read-tree -v --reset $update "$rev" || exit
fi

# Any resets update HEAD to the head being switched to.
Expand Down

0 comments on commit 4c474b6

Please sign in to comment.