submodule update: remove "-v" option

In e84c3cf3dc3 (git-submodule.sh: accept verbose flag in cmd_update to
be non-quiet, 2018-08-14) the "git submodule update" sub-command was
made to understand "-v", but the option was never documented.

The only in-tree user has been this test added in
3ad0401e9e6 (submodule update: silence underlying merge/rebase with
"--quiet", 2020-09-30), it wasn't per-se testing --quiet, but fixing a
bug in e84c3cf3dc3: It used to set "GIT_QUIET=0" instead of unsetting
it on "-v", and thus we'd end up passing "--quiet" to "git
submodule--helper" on "-v", since the "--quiet" option was passed
using the ${parameter:+word} construct.

Furthermore, even if someone had used the "-v" option they'd only be
getting the default output. Our default in both git-submodule.sh and
"git submodule--helper" has been to be "verbose", so the only way this
option could have matter is if it were used as e.g.:

    git submodule --quiet update -v [...]

I.e. to undo the effect of a previous "--quiet" on the command-line.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-submodule.sh b/git-submodule.sh
index 5b9683bf766388d01984b2dc70be765a29e25077..0df6b0fc974ed08c1dc87b4b7e47ae823deaacc8 100755 (executable)
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -241,9 +241,6 @@ cmd_update()
                -q|--quiet)
                        GIT_QUIET=1
                        ;;
-               -v)
-                       unset GIT_QUIET
-                       ;;
                --progress)
                        progress=1
                        ;;

diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index 43f779d751cfe2645b038811e69b6f67fee2ed34..06d804e21314532cf68b527d70ad95e8e9a4a80b 100755 (executable)
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -1074,7 +1074,7 @@ test_expect_success 'submodule update --quiet passes quietness to merge/rebase'
         git submodule update --rebase --quiet >out 2>err &&
         test_must_be_empty out &&
         test_must_be_empty err &&
-        git submodule update --rebase -v >out 2>err &&
+        git submodule update --rebase >out 2>err &&
         test_file_not_empty out &&
         test_must_be_empty err
        )