The subcommand 'set-branch' had the 'quiet' option which was
introduced in b57e8119e6 by Denton Liu but was never utilised due to
not setting of the 'GIT_QUIET' variable. Add functionality to
utilise the 'quiet' function.
Mentored-by: Christian Couder <chriscool@xxxxxxxxxxxxx>
Mentored-by: Kaartic Sivaraam <kaartic.sivaraam@xxxxxxxxx>
Signed-off-by: Shourya Shukla <shouryashukla.oo@xxxxxxxxx>
---
There was an existence of the `quiet` option in the shell version of
'set-branch' but it was not used anywhere. I decided to add a utility
of the option here by setting GIT_QUIET to 1 in case of a `quiet` as
well as ensure proper functioning in the C version regarding the same.
The if-statement is inspired from what Junio suggested me in my previous
conversion of 'set-url'.
builtin/submodule--helper.c | 6 ++++--
git-submodule.sh | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 5a8815b76e..36b69df5c4 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -2321,7 +2321,8 @@ static int module_set_branch(int argc, const char **argv, const char *prefix)
config_name = xstrfmt("submodule.%s.branch", path);
config_set_in_gitmodules_file_gently(config_name, newbranch);
- printf(_("Default tracking branch set to '%s' successfully\n"), newbranch);
+ if (!(quiet ? OPT_QUIET : 0))
+ printf(_("Default tracking branch set to '%s' successfully\n"), newbranch);
free(config_name);
}
@@ -2334,7 +2335,8 @@ static int module_set_branch(int argc, const char **argv, const char *prefix)
config_name = xstrfmt("submodule.%s.branch", path);
config_set_in_gitmodules_file_gently(config_name, NULL);
- printf(_("Default tracking branch set to 'master' successfully\n"));
+ if (!(quiet ? OPT_QUIET : 0))
+ printf(_("Default tracking branch set to 'master' successfully\n"));
free(config_name);
}
diff --git a/git-submodule.sh b/git-submodule.sh
index 2438ef576e..0cdc77ace6 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -725,7 +725,7 @@ cmd_set_branch() {
do
case "$1" in
-q|--quiet)
- # we don't do anything with this but we need to accept it
+ GIT_QUIET=1
;;
-d|--default)
default=1
--
2.26.2
