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

submodule, repack: migrate to git-sh-setup's say()

Browse Source 
Now that there is say() in git-sh-setup, these scripts don't need to use
their own. Migrate them over by setting GIT_QUIET and removing their
custom say() functions.

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stephen Boyd 2009-06-16 15:33:00 -07:00 committed by Junio C Hamano
parent e064c170b4
commit 2e6a30ef8f
2 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
git-repack.sh
View File

@ -24,7 +24,7 @@ SUBDIRECTORY_OK='Yes'
. git-sh-setup
no_update_info= all_into_one= remove_redundant= unpack_unreachable=
local= quiet= no_reuse= extra=
local= no_reuse= extra=
while test $# != 0
do
case "$1" in
@ -33,7 +33,7 @@ do
-A) all_into_one=t
unpack_unreachable=--unpack-unreachable ;;
-d) remove_redundant=t ;;
-q) quiet=-q ;;
-q) GIT_QUIET=t ;;
-f) no_reuse=--no-reuse-object ;;
-l) local=--local ;;
--max-pack-size|--window|--window-memory|--depth)
@ -80,13 +80,11 @@ case ",$all_into_one," in
;;
esac
args="$args $local $quiet $no_reuse$extra"
args="$args $local ${GIT_QUIET:+-q} $no_reuse$extra"
names=$(git pack-objects --honor-pack-keep --non-empty --all --reflog $args </dev/null "$PACKTMP") ||
exit 1
if [ -z "$names" ]; then
if test -z "$quiet"; then
echo Nothing new to pack.
fi
say Nothing new to pack.
fi
# Ok we have prepared all new packfiles.
@ -176,7 +174,7 @@ then
done
)
fi
git prune-packed $quiet
git prune-packed ${GIT_QUIET:+-q}
fi
case "$no_update_info" in

24
git-submodule.sh
View File

@ -14,23 +14,11 @@ require_work_tree
command=
branch=
quiet=
reference=
cached=
nofetch=
update=
#
# print stuff on stdout unless -q was specified
#
say()
{
if test -z "$quiet"
then
echo "$@"
fi
}
# Resolve relative url by appending to parent's url
resolve_relative_url ()
{
@ -137,7 +125,7 @@ cmd_add()
shift
;;
-q|--quiet)
quiet=1
GIT_QUIET=1
;;
--reference)
case "$2" in '') usage ;; esac
@ -273,7 +261,7 @@ cmd_init()
do
case "$1" in
-q|--quiet)
quiet=1
GIT_QUIET=1
;;
--)
shift
@ -333,7 +321,7 @@ cmd_update()
case "$1" in
-q|--quiet)
shift
quiet=1
GIT_QUIET=1
;;
-i|--init)
init=1
@ -650,7 +638,7 @@ cmd_status()
do
case "$1" in
-q|--quiet)
quiet=1
GIT_QUIET=1
;;
--cached)
cached=1
@ -704,7 +692,7 @@ cmd_sync()
do
case "$1" in
-q|--quiet)
quiet=1
GIT_QUIET=1
shift
;;
--)
@ -759,7 +747,7 @@ do
command=$1
;;
-q|--quiet)
quiet=1
GIT_QUIET=1
;;
-b|--branch)
case "$2" in