Merge branch 'ep/maint-equals-null-cocci' for maint-2.35

* ep/maint-equals-null-cocci:
  tree-wide: apply equals-null.cocci
  contrib/coccinnelle: add equals-null.cocci

diff --cc apply.c
Simple merge

diff --cc archive.c
Simple merge

diff --cc branch.c
index 5d20a2e8484b22f321a60e01d63cb4c4bd8e88fe,fc49f57d77d945c8635a297dc1e7bdbb9e789229..bc46adfa25c6208b2701a25d9e667a1b4db9861c
--- 1/branch.c
--- 2/branch.c
+++ b/branch.c
@@@ -405,8 -302,8 +405,8 @@@ void create_branch(struct repository *r
                break;
        }
  
-       if ((commit = lookup_commit_reference(r, &oid)) == NULL)
+       if (!(commit = lookup_commit_reference(r, &oid)))
 -              die(_("Not a valid branch point: '%s'."), start_name);
 +              die(_("not a valid branch point: '%s'"), start_name);
        oidcpy(&oid, &commit->object.oid);
  
        if (reflog)

diff --cc builtin/checkout.c
Simple merge

diff --cc builtin/clone.c
Simple merge

diff --cc builtin/commit.c
Simple merge

diff --cc builtin/diff.c
Simple merge

diff --cc builtin/gc.c
Simple merge

diff --cc builtin/index-pack.c
Simple merge

diff --cc builtin/log.c
Simple merge

diff --cc builtin/ls-remote.c
Simple merge

diff --cc builtin/receive-pack.c
Simple merge

diff --cc builtin/replace.c
Simple merge

diff --cc builtin/tag.c
Simple merge

diff --cc commit-graph.c
Simple merge

diff --cc compat/mingw.c
Simple merge

diff --cc config.c
Simple merge

diff --cc daemon.c
Simple merge

diff --cc dir.c
Simple merge

diff --cc http-fetch.c
Simple merge

diff --cc http.c
Simple merge

diff --cc log-tree.c
Simple merge

diff --cc merge-ort.c
Simple merge

diff --cc object-file.c
Simple merge

diff --cc pack-bitmap.c
Simple merge

diff --cc packfile.c
Simple merge

diff --cc ref-filter.c
Simple merge

diff --cc revision.c
Simple merge

diff --cc setup.c
Simple merge

diff --cc trailer.c
Simple merge

diff --cc transport.c
Simple merge

diff --cc worktree.c
Simple merge

diff --cc xdiff-interface.c
Simple merge

diff --cc xdiff/xprepare.c
index 4527a4a07c4e0986cb377015d09f9a13309c04d8,4c0561ce1fd1ad5487398fee19adc3bda073da15..105752758f2f3870448f1ec1cf0070c3a29b36e6
--- 1/xdiff/xprepare.c
--- 2/xdiff/xprepare.c
+++ b/xdiff/xprepare.c
@@@ -181,14 -181,18 +181,14 @@@ static int xdl_prepare_ctx(unsigned in
        if (!(recs = (xrecord_t **) xdl_malloc(narec * sizeof(xrecord_t *))))
                goto abort;
  
 -      if (XDF_DIFF_ALG(xpp->flags) == XDF_HISTOGRAM_DIFF)
 -              hbits = hsize = 0;
 -      else {
 -              hbits = xdl_hashbits((unsigned int) narec);
 -              hsize = 1 << hbits;
 -              if (!(rhash = (xrecord_t **) xdl_malloc(hsize * sizeof(xrecord_t *))))
 -                      goto abort;
 -              memset(rhash, 0, hsize * sizeof(xrecord_t *));
 -      }
 +      hbits = xdl_hashbits((unsigned int) narec);
 +      hsize = 1 << hbits;
 +      if (!(rhash = (xrecord_t **) xdl_malloc(hsize * sizeof(xrecord_t *))))
 +              goto abort;
 +      memset(rhash, 0, hsize * sizeof(xrecord_t *));
  
        nrec = 0;
-       if ((cur = blk = xdl_mmfile_first(mf, &bsize)) != NULL) {
+       if ((cur = blk = xdl_mmfile_first(mf, &bsize))) {
                for (top = blk + bsize; cur < top; ) {
                        prev = cur;
                        hav = xdl_hash_record(&cur, top, xpp->flags);