Skip to content

Commit 0d68ee7

Browse files
avargitster
authored andcommitted
submodule update: remove "-v" option
In e84c3cf (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 3ad0401 (submodule update: silence underlying merge/rebase with "--quiet", 2020-09-30), it wasn't per-se testing --quiet, but fixing a bug in e84c3cf: 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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d9c7f69 commit 0d68ee7

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

git-submodule.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,6 @@ cmd_update()
241241
-q|--quiet)
242242
GIT_QUIET=1
243243
;;
244-
-v)
245-
unset GIT_QUIET
246-
;;
247244
--progress)
248245
progress=1
249246
;;

t/t7406-submodule-update.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1074,7 +1074,7 @@ test_expect_success 'submodule update --quiet passes quietness to merge/rebase'
10741074
git submodule update --rebase --quiet >out 2>err &&
10751075
test_must_be_empty out &&
10761076
test_must_be_empty err &&
1077-
git submodule update --rebase -v >out 2>err &&
1077+
git submodule update --rebase >out 2>err &&
10781078
test_file_not_empty out &&
10791079
test_must_be_empty err
10801080
)

0 commit comments

Comments
 (0)