Re: [PATCH 2/2] submodule: Add 'quiet' option in subcommand 'set-branch'
- From
Denton Liu <liu.denton@gmail.com>
- Date
- May 14, 2020, 10:15 UTC
- Message-ID
- <20200514101534.GB28018@generichostname>
- In-Reply-To
- <20200513201737.55778-2-shouryashukla.oo@gmail.com>
Hi Shourya,
I'm not really sure if we should have this patch at all since I don't think that set-branch should be printing anything at all.
But I'll give some comments anyway. Hopefully they'll be enlightening.
On Thu, May 14, 2020 at 01:47:37AM +0530, Shourya Shukla wrote:
> The subcommand 'set-branch' had the 'quiet' option which was > introduced in b57e8119e6 by Denton Liu but was never utilised due to
We typically refer to commits by the "reference" format. You can get that as follows:
$ git show --pretty=ref -s b57e8119e6 b57e8119e6 (submodule: teach set-branch subcommand, 2019-02-08)
In addition, I don't think it's necessary to mention me by name in this case.
Show 28 quoted lines
> not setting of the 'GIT_QUIET' variable. Add functionality to
> utilise the 'quiet' function.
>
> Mentored-by: Christian Couder <chriscool@tuxfamily.org>
> Mentored-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
> Signed-off-by: Shourya Shukla <shouryashukla.oo@gmail.com>
> ---
> 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))This is needlessly complicated... Can't this just be written as
if (!quiet)
Show 30 quoted lines
> + 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
>