X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-checkout.sh;h=ed7c2c5f6aab338c844329e3ae3d9c7ce003680f;hb=abda5227770b39bb4abd8f0b4c1a0f69c2778300;hp=deb0a9a3c733ed889158d05b7cae4d174917553d;hpb=ee9693e246669f48f6b058a1044cefa973a44c22;p=git.git

diff --git a/git-checkout.sh b/git-checkout.sh
index deb0a9a3c..ed7c2c5f6 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
 	'')	;;
 	*)