From: Derrick Stolee <stolee@gmail.com>
To: Emily Shaffer <emilyshaffer@google.com>, git@vger.kernel.org
Subject: Re: [PATCH 2/2] progress: remove redundant null-checking
Date: Thu, 9 Jul 2020 22:01:08 -0400 [thread overview]
Message-ID: <aebbc1ca-9936-ce1b-bacc-855d353f83f9@gmail.com> (raw)
In-Reply-To: <20200710014242.1088216-3-emilyshaffer@google.com>
On 7/9/2020 9:42 PM, Emily Shaffer wrote:
> display_progress() and stop_progress() are tolerant to NULL inputs.
> Remove some places where redundant checks are performed before these
> NULL-tolerant functions are called.
>
> Signed-off-by: Emily Shaffer <emilyshaffer@google.com>
> ---
> builtin/commit-graph.c | 3 +--
> commit-graph.c | 3 +--
> read-cache.c | 9 +++------
> 3 files changed, 5 insertions(+), 10 deletions(-)
>
> diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c
> index ae4dc2dfcd..7964de3126 100644
> --- a/builtin/commit-graph.c
> +++ b/builtin/commit-graph.c
> @@ -263,8 +263,7 @@ static int graph_write(int argc, const char **argv)
> cleanup:
> string_list_clear(&pack_indexes, 0);
> strbuf_release(&buf);
> - if (progress)
> - stop_progress(&progress);
> + stop_progress(&progress);
> return result;
> }
>
> diff --git a/commit-graph.c b/commit-graph.c
> index b9a784fece..30d9a75932 100644
> --- a/commit-graph.c
> +++ b/commit-graph.c
> @@ -1424,8 +1424,7 @@ int write_commit_graph_reachable(struct object_directory *odb,
> flags, split_opts);
>
> oidset_clear(&commits);
> - if (data.progress)
> - stop_progress(&data.progress);
> + stop_progress(&data.progress);
> return result;
> }
>
> diff --git a/read-cache.c b/read-cache.c
> index 2ddc422dbd..feb7abe37a 100644
> --- a/read-cache.c
> +++ b/read-cache.c
> @@ -1581,8 +1581,7 @@ int refresh_index(struct index_state *istate, unsigned int flags,
> new_entry = refresh_cache_ent(istate, ce, options, &cache_errno, &changed);
> if (new_entry == ce)
> continue;
> - if (progress)
> - display_progress(progress, i);
> + display_progress(progress, i);
> if (!new_entry) {
> const char *fmt;
>
> @@ -1614,10 +1613,8 @@ int refresh_index(struct index_state *istate, unsigned int flags,
>
> replace_index_entry(istate, i, new_entry);
> }
> - if (progress) {
> - display_progress(progress, istate->cache_nr);
> - stop_progress(&progress);
> - }
> + display_progress(progress, istate->cache_nr);
> + stop_progress(&progress);
> trace_performance_leave("refresh index");
> return has_errors;
Looks obviously correct to me.
Thanks,
-Stolee
next prev parent reply other threads:[~2020-07-10 2:01 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-10 1:42 [PATCH 0/2] enable progress traces even when quiet Emily Shaffer
2020-07-10 1:42 ` [PATCH 1/2] progress: create progress struct in 'verbose' mode Emily Shaffer
2020-07-10 2:00 ` Derrick Stolee
2020-07-10 2:17 ` Taylor Blau
2020-07-10 19:21 ` Emily Shaffer
2020-07-10 2:14 ` brian m. carlson
2020-07-10 19:24 ` Emily Shaffer
2020-07-10 21:09 ` Junio C Hamano
2020-07-10 22:00 ` Emily Shaffer
2020-07-10 22:40 ` Junio C Hamano
2020-07-14 0:15 ` Emily Shaffer
2020-08-17 22:19 ` Emily Shaffer
2020-08-17 22:44 ` Junio C Hamano
2020-08-17 22:49 ` Junio C Hamano
2020-09-09 22:42 ` Jonathan Tan
2020-09-09 22:36 ` Jonathan Tan
2020-09-09 23:06 ` Junio C Hamano
2020-09-10 0:31 ` Jonathan Nieder
2020-09-10 5:09 ` Junio C Hamano
2020-07-10 1:42 ` [PATCH 2/2] progress: remove redundant null-checking Emily Shaffer
2020-07-10 2:01 ` Derrick Stolee [this message]
2020-07-10 2:20 ` Taylor Blau
2020-07-10 18:50 ` Junio C Hamano
2020-07-10 19:27 ` Emily Shaffer
2020-07-10 19:58 ` Junio C Hamano
2020-07-10 20:29 ` Emily Shaffer
2020-07-10 23:03 ` Emily Shaffer
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=aebbc1ca-9936-ce1b-bacc-855d353f83f9@gmail.com \
--to=stolee@gmail.com \
--cc=emilyshaffer@google.com \
--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).