Merge branch 'sg/xcalloc-cocci-fix'

[thirdparty/git.git] / promisor-remote.c

diff --git a/promisor-remote.c b/promisor-remote.c
index 1a2983c7016fca50f1d0161580f83000de06e529..68f46f5ec70b93b28fa7c75988d671a4046e8fee 100644 (file)
--- a/promisor-remote.c
+++ b/promisor-remote.c
@@ -22,7 +22,7 @@ static int fetch_objects(struct repository *repo,
        child.git_cmd = 1;
        child.in = -1;
        if (repo != the_repository)
-               prepare_other_repo_env(&child.env_array, repo->gitdir);
+               prepare_other_repo_env(&child.env, repo->gitdir);
        strvec_pushl(&child.args, "-c", "fetch.negotiationAlgorithm=noop",
                     "fetch", remote_name, "--no-tags",
                     "--no-write-fetch-head", "--recurse-submodules=no",
@@ -84,7 +84,7 @@ static void promisor_remote_move_to_tail(struct promisor_remote_config *config,
                                         struct promisor_remote *r,
                                         struct promisor_remote *previous)
 {
-       if (r->next == NULL)
+       if (!r->next)
                return;
 
        if (previous)