| Message ID | 7197540df60d34e8f727e29d300dd0c96e31d310.1684324059.git.ps@pks.im (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 6bc7a37e79876092b42a89156a8c24d0a60bd672 |
| Headers | show |
| Series | fetch: smallish cleanups | expand |
On Wed, May 17, 2023 at 01:48:46PM +0200, Patrick Steinhardt wrote: > Drop the `NULL` check for `remote_ref` in `update_local_ref()`. The > function only has a single caller, and that caller always passes in a > non-`NULL` value. > > This fixes a false positive in Coverity. Thanks for following up on this. I was thinking of just reposting it, thinking there weren't that many other cleanups to do in fetch.c. But you found quite a few. :) The patch looks obviously good to me. -Peff
diff --git a/builtin/fetch.c b/builtin/fetch.c index 9147b700e5..f268322e6f 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -953,11 +953,10 @@ static int update_local_ref(struct ref *ref, * Base this on the remote's ref name, as it's * more likely to follow a standard layout. */ - const char *name = remote_ref ? remote_ref->name : ""; - if (starts_with(name, "refs/tags/")) { + if (starts_with(remote_ref->name, "refs/tags/")) { msg = "storing tag"; what = _("[new tag]"); - } else if (starts_with(name, "refs/heads/")) { + } else if (starts_with(remote_ref->name, "refs/heads/")) { msg = "storing head"; what = _("[new branch]"); } else {
Drop the `NULL` check for `remote_ref` in `update_local_ref()`. The function only has a single caller, and that caller always passes in a non-`NULL` value. This fixes a false positive in Coverity. Signed-off-by: Patrick Steinhardt <ps@pks.im> --- builtin/fetch.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)