undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add file checkout progress

Browse Source 
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>
This commit is contained in:
Nicolas Pitre 2007-04-23 13:17:19 -04:00 committed by Junio C Hamano
parent 2cc3167c68
commit 4c474b6f92
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
git-checkout.sh
View File

@ -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
'') ;;
*)

2
git-reset.sh
View File

@ -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.