From: Abhishek Kumar <abhishekkumar8222@gmail.com>
To: erlend-a@innova.no
Cc: git@vger.kernel.org
Subject: Re: [RFC PATCH] Make rev-parse -q and --is-* quiet
Date: Fri, 13 Mar 2020 23:00:00 +0530 [thread overview]
Message-ID: <CAHk66ftWBYF3d_L0-__BP5mKNxBioj57y44yhyqGrtK3TZTjSg@mail.gmail.com> (raw)
> If rev-parse is called with both -q and an --is-* option, the result is
> provided as the return code of the command, iso. printed to stdout.
>
> This simplifies using these queries in shell scripts:
> git rev-parse --is-bare-repository && do_stuff
> git rev-parse --is-shallow-repository && do_stuff
>
> Signed-off-by: Erlend E. Aasland <erlend.aasland@innova.no>
> ---
> builtin/rev-parse.c | 25 ++++++++++++++++---------
> 1 file changed, 16 insertions(+), 9 deletions(-)
>
> diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
> index 7a00da8203..5a8b404ec7 100644
> --- a/builtin/rev-parse.c
> +++ b/builtin/rev-parse.c
> @@ -874,24 +874,31 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
> continue;
> }
> if (!strcmp(arg, "--is-inside-git-dir")) {
> - printf("%s\n", is_inside_git_dir() ? "true"
> - : "false");
> + int is_set = is_inside_git_dir();
Avoid declaration after statement. Move is_set to the beginning of
cmd_rev_parse().
Also, be more specific than "is_set". A variable like "is_inside" would
be more appropriate.
> + if (quiet)
> + return is_set ? 0 : 1;
Returning prematurely might be a bad idea. If there are more options after
"--is-inside-git-dir", they will be not executed. You can maybe rewrite this as:
```
if (!strcmp(arg, "--is-inside-git-dir")) {
is_set = is_inside_git_dir();
if (!quiet)
printf("%s\n", is_set ? "true"
: "false");
continue;
}
```
And then return the value at the end of function, replacing '0' with !is_set.
Same comment for other blocks.
> if (!strcmp(arg, "--is-inside-work-tree")) {
> - printf("%s\n", is_inside_work_tree() ? "true"
> - : "false");
> + int is_set = is_inside_work_tree();
> + if (quiet)
> + return is_set ? 0 : 1;
> + printf("%s\n", is_set ? "true" : "false");
> continue;
> }
> if (!strcmp(arg, "--is-bare-repository")) {
> - printf("%s\n", is_bare_repository() ? "true"
> - : "false");
> + int is_set = is_bare_repository();
> + if (quiet)
> + return is_set ? 0 : 1;
> + printf("%s\n", is_set ? "true" : "false");
> continue;
> }
> if (!strcmp(arg, "--is-shallow-repository")) {
> - printf("%s\n",
> - is_repository_shallow(the_repository) ? "true"
> - : "false");
> + int is_set = is_repository_shallow(the_repository);
> + if (quiet)
> + return is_set ? 0 : 1;
> + printf("%s\n", is_set ? "true" : "false");
> continue;
> }
> if (!strcmp(arg, "--shared-index-path")) {
> --
> 2.25.1
I am wondering if we should stop the script from running if both quiet
and --is-* options are passed.
Regards
Abhishek
next reply other threads:[~2020-03-13 17:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-13 17:30 Abhishek Kumar [this message]
2020-03-13 17:47 ` [RFC PATCH] Make rev-parse -q and --is-* quiet Jeff King
2020-03-13 18:18 ` Junio C Hamano
2020-03-13 19:10 ` Erlend Aasland
2020-03-13 17:50 ` Eric Sunshine
-- strict thread matches above, loose matches on Subject: below --
2020-03-13 12:13 Erlend Aasland
2020-03-13 17:52 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAHk66ftWBYF3d_L0-__BP5mKNxBioj57y44yhyqGrtK3TZTjSg@mail.gmail.com \
--to=abhishekkumar8222@gmail.com \
--cc=erlend-a@innova.no \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).