diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-07-02 02:40:50 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-02 02:40:50 (GMT) |
| commit | e6c7c2cc9766434607b8da5db872e7881a043925 (patch) | |
| tree | ab967dcf2cedf2f9f63d54e12adc1ca046e4edc2 /git-submodule.sh | |
| parent | 4197195bee15f120e99d797b22108fd274235fd7 (diff) | |
| parent | fcdd0e92d9d42b8fa4569d92ba1013bb0eedfcd8 (diff) | |
| download | git-e6c7c2cc9766434607b8da5db872e7881a043925.zip git-e6c7c2cc9766434607b8da5db872e7881a043925.tar.gz git-e6c7c2cc9766434607b8da5db872e7881a043925.tar.bz2 | |
Merge branch 'sb/quiet-porcelains'
* sb/quiet-porcelains:
stash: teach quiet option
am, rebase: teach quiet option
submodule, repack: migrate to git-sh-setup's say()
git-sh-setup: introduce say() for quiet options
am: suppress apply errors when using 3-way
t4150: test applying with a newline in subject
Diffstat (limited to 'git-submodule.sh')
| -rwxr-xr-x | git-submodule.sh | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index f4f3562..ebed711 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -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 @@ -659,7 +647,7 @@ cmd_status() do case "$1" in -q|--quiet) - quiet=1 + GIT_QUIET=1 ;; --cached) cached=1 @@ -713,7 +701,7 @@ cmd_sync() do case "$1" in -q|--quiet) - quiet=1 + GIT_QUIET=1 shift ;; --) @@ -768,7 +756,7 @@ do command=$1 ;; -q|--quiet) - quiet=1 + GIT_QUIET=1 ;; -b|--branch) case "$2" in |