git-sh-setup.sh: remove "say" function, change last users
Remove the "say" function, with various rewrites of the remaining
git-*.sh code to C and the preceding change to have git-submodule.sh
stop using the GIT_QUIET variable there were only four uses in
git-subtree.sh. Let's have it use an "arg_quiet" variable instead, and
move the "say" function over to it.
The only other use was a trivial message in git-instaweb.sh, since it
has never supported the --quiet option (or similar) that code added in
0b624b4cee
(instaweb: restart server if already running, 2009-11-22)
can simply use "echo" instead.
The remaining in-tree hits from "say" are all for the sibling function
defined in t/test-lib.sh. It's safe to remove this function since it
has never been documented in Documentation/git-sh-setup.txt.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
2eec463739
commit
5b893f7d81
@ -50,6 +50,14 @@ m,message= use the given message as the commit message for the merge commit
|
|||||||
|
|
||||||
indent=0
|
indent=0
|
||||||
|
|
||||||
|
# Usage: say [MSG...]
|
||||||
|
say () {
|
||||||
|
if test -z "$arg_quiet"
|
||||||
|
then
|
||||||
|
printf '%s\n' "$*"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
# Usage: debug [MSG...]
|
# Usage: debug [MSG...]
|
||||||
debug () {
|
debug () {
|
||||||
if test -n "$arg_debug"
|
if test -n "$arg_debug"
|
||||||
@ -60,7 +68,7 @@ debug () {
|
|||||||
|
|
||||||
# Usage: progress [MSG...]
|
# Usage: progress [MSG...]
|
||||||
progress () {
|
progress () {
|
||||||
if test -z "$GIT_QUIET"
|
if test -z "$arg_quiet"
|
||||||
then
|
then
|
||||||
if test -z "$arg_debug"
|
if test -z "$arg_debug"
|
||||||
then
|
then
|
||||||
@ -146,6 +154,7 @@ main () {
|
|||||||
eval "$set_args"
|
eval "$set_args"
|
||||||
|
|
||||||
# Begin "real" flag parsing.
|
# Begin "real" flag parsing.
|
||||||
|
arg_quiet=
|
||||||
arg_debug=
|
arg_debug=
|
||||||
arg_prefix=
|
arg_prefix=
|
||||||
arg_split_branch=
|
arg_split_branch=
|
||||||
@ -161,7 +170,7 @@ main () {
|
|||||||
|
|
||||||
case "$opt" in
|
case "$opt" in
|
||||||
-q)
|
-q)
|
||||||
GIT_QUIET=1
|
arg_quiet=1
|
||||||
;;
|
;;
|
||||||
-d)
|
-d)
|
||||||
arg_debug=1
|
arg_debug=1
|
||||||
@ -252,7 +261,7 @@ main () {
|
|||||||
dir="$(dirname "$arg_prefix/.")"
|
dir="$(dirname "$arg_prefix/.")"
|
||||||
|
|
||||||
debug "command: {$arg_command}"
|
debug "command: {$arg_command}"
|
||||||
debug "quiet: {$GIT_QUIET}"
|
debug "quiet: {$arg_quiet}"
|
||||||
debug "dir: {$dir}"
|
debug "dir: {$dir}"
|
||||||
debug "opts: {$*}"
|
debug "opts: {$*}"
|
||||||
debug
|
debug
|
||||||
|
@ -102,7 +102,7 @@ resolve_full_httpd () {
|
|||||||
|
|
||||||
start_httpd () {
|
start_httpd () {
|
||||||
if test -f "$fqgitdir/pid"; then
|
if test -f "$fqgitdir/pid"; then
|
||||||
say "Instance already running. Restarting..."
|
echo "Instance already running. Restarting..."
|
||||||
stop_httpd
|
stop_httpd
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -57,15 +57,6 @@ die_with_status () {
|
|||||||
exit "$status"
|
exit "$status"
|
||||||
}
|
}
|
||||||
|
|
||||||
GIT_QUIET=
|
|
||||||
|
|
||||||
say () {
|
|
||||||
if test -z "$GIT_QUIET"
|
|
||||||
then
|
|
||||||
printf '%s\n' "$*"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
if test -n "$OPTIONS_SPEC"; then
|
if test -n "$OPTIONS_SPEC"; then
|
||||||
usage() {
|
usage() {
|
||||||
"$0" -h
|
"$0" -h
|
||||||
|
Loading…
Reference in New Issue
Block a user