submodule, repack: migrate to git-sh-setup's say()
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>
Stephen Boyd committed
Jun 16, 2009 at 15:33 UTC
2e6a30ef8fbaedc5f2ee199d36f7256bb0cfdf1e
2 files changed
+11
-25
git-repack.sh
+5
-7
@@ -24,7 +24,7 @@ SUBDIRECTORY_OK='Yes'
24
. git-sh-setup
25
26
no_update_info= all_into_one= remove_redundant= unpack_unreachable=
27
-local= quiet= no_reuse= extra=
27
+local= no_reuse= extra=
28
while test $# != 0
29
do
30
case "$1" in
@@ -33,7 +33,7 @@ do
33
-A) all_into_one=t
34
unpack_unreachable=--unpack-unreachable ;;
35
-d) remove_redundant=t ;;
36
- -q) quiet=-q ;;
36
+ -q) GIT_QUIET=t ;;
37
-f) no_reuse=--no-reuse-object ;;
38
-l) local=--local ;;
39
--max-pack-size|--window|--window-memory|--depth)
@@ -80,13 +80,11 @@ case ",$all_into_one," in
80
;;
81
esac
82
83
-args="$args $local $quiet $no_reuse$extra"
83
+args="$args $local ${GIT_QUIET:+-q} $no_reuse$extra"
84
names=$(git pack-objects --honor-pack-keep --non-empty --all --reflog $args </dev/null "$PACKTMP") ||
85
exit 1
86
if [ -z "$names" ]; then
87
- if test -z "$quiet"; then
88
- echo Nothing new to pack.
89
- fi
87
+ say Nothing new to pack.
88
fi
89
90
# Ok we have prepared all new packfiles.
@@ -176,7 +174,7 @@ then
174
done
175
)
176
fi
179
- git prune-packed $quiet
177
+ git prune-packed ${GIT_QUIET:+-q}
178
fi
179
180
case "$no_update_info" in
git-submodule.sh
+6
-18
@@ -14,23 +14,11 @@ require_work_tree
14
15
command=
16
branch=
17
-quiet=
17
reference=
18
cached=
19
nofetch=
20
update=
21
23
-#
24
-# print stuff on stdout unless -q was specified
25
-#
26
-say()
27
-{
28
- if test -z "$quiet"
29
- then
30
- echo "$@"
31
- fi
32
-}
33
-
22
# Resolve relative url by appending to parent's url
23
resolve_relative_url ()
24
{
@@ -137,7 +125,7 @@ cmd_add()
125
shift
126
;;
127
-q|--quiet)
140
- quiet=1
128
+ GIT_QUIET=1
129
;;
130
--reference)
131
case "$2" in '') usage ;; esac
@@ -273,7 +261,7 @@ cmd_init()
261
do
262
case "$1" in
263
-q|--quiet)
276
- quiet=1
264
+ GIT_QUIET=1
265
;;
266
--)
267
shift
@@ -333,7 +321,7 @@ cmd_update()
321
case "$1" in
322
-q|--quiet)
323
shift
336
- quiet=1
324
+ GIT_QUIET=1
325
;;
326
-i|--init)
327
init=1
@@ -650,7 +638,7 @@ cmd_status()
638
do
639
case "$1" in
640
-q|--quiet)
653
- quiet=1
641
+ GIT_QUIET=1
642
;;
643
--cached)
644
cached=1
@@ -704,7 +692,7 @@ cmd_sync()
692
do
693
case "$1" in
694
-q|--quiet)
707
- quiet=1
695
+ GIT_QUIET=1
696
shift
697
;;
698
--)
@@ -759,7 +747,7 @@ do
747
command=$1
748
;;
749
-q|--quiet)
762
- quiet=1
750
+ GIT_QUIET=1
751
;;
752
-b|--branch)
753
case "$2" in