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

Introduce and apply coccinelle rule to discourage an explicit
comparison between a pointer and NULL, and applies the clean-up to
the maintenance track.

* ep/maint-equals-null-cocci:
  tree-wide: apply 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 blame.c
Simple merge

diff --cc branch.c
index 01ecb816d5c4181786e7affab5aabd6a270a1db8,bc46adfa25c6208b2701a25d9e667a1b4db9861c..d0ca2b76d2ba069d5bcc549e79e59826d174ecc7
--- 1/branch.c
--- 2/branch.c
+++ b/branch.c
@@@ -466,45 -405,9 +466,45 @@@ static void dwim_branch_start(struct re
                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);
 -      oidcpy(&oid, &commit->object.oid);
 +      if (out_real_ref) {
 +              *out_real_ref = real_ref;
 +              real_ref = NULL;
 +      }
 +      if (out_oid)
 +              oidcpy(out_oid, &commit->object.oid);
 +
 +      FREE_AND_NULL(real_ref);
 +}
 +
 +void create_branch(struct repository *r,
 +                 const char *name, const char *start_name,
 +                 int force, int clobber_head_ok, int reflog,
 +                 int quiet, enum branch_track track, int dry_run)
 +{
 +      struct object_id oid;
 +      char *real_ref;
 +      struct strbuf ref = STRBUF_INIT;
 +      int forcing = 0;
 +      struct ref_transaction *transaction;
 +      struct strbuf err = STRBUF_INIT;
 +      char *msg;
 +
 +      if (track == BRANCH_TRACK_OVERRIDE)
 +              BUG("'track' cannot be BRANCH_TRACK_OVERRIDE. Did you mean to call dwim_and_setup_tracking()?");
 +      if (clobber_head_ok && !force)
 +              BUG("'clobber_head_ok' can only be used with 'force'");
 +
 +      if (clobber_head_ok ?
 +                        validate_branchname(name, &ref) :
 +                        validate_new_branchname(name, &ref, force)) {
 +              forcing = 1;
 +      }
 +
 +      dwim_branch_start(r, start_name, track, &real_ref, &oid);
 +      if (dry_run)
 +              goto cleanup;
  
        if (reflog)
                log_all_ref_updates = LOG_REFS_NORMAL;

diff --cc builtin/bisect--helper.c
Simple merge

diff --cc builtin/checkout.c
Simple merge

diff --cc builtin/clone.c
index 194d50f75f337edf30d9044a676cdbd4ce0d536d,2cf389403c3cba9b5d1a8ee8c1cca1e27ba712f1..89a91b0017725990345b6f91e61069c2f35819a6
--- 1/builtin/clone.c
--- 2/builtin/clone.c
+++ b/builtin/clone.c
@@@ -1106,12 -1070,10 +1106,12 @@@ int cmd_clone(int argc, const char **ar
         * apply the remote name provided by --origin only after this second
         * call to git_config, to ensure it overrides all config-based values.
         */
-       if (option_origin != NULL) {
 -      if (option_origin)
++      if (option_origin) {
 +              free(remote_name);
                remote_name = xstrdup(option_origin);
 +      }
  
-       if (remote_name == NULL)
+       if (!remote_name)
                remote_name = xstrdup("origin");
  
        if (!valid_remote_name(remote_name))

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/mailsplit.c
Simple merge

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

diff --cc builtin/replace.c
Simple merge

diff --cc builtin/rev-parse.c
Simple merge

diff --cc builtin/shortlog.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 dir.c
Simple merge

diff --cc ewah/bitmap.c
index 87d5cc8fa30cd016df5b05378576d7d48a7d76d7,a4f9fcd1c1bc230f459b21a1e0d061165c919a71..ac618641632f8c347b2a2900fb15b0de9ed8dd8a
--- 1/ewah/bitmap.c
--- 2/ewah/bitmap.c
+++ b/ewah/bitmap.c
@@@ -216,9 -216,14 +216,9 @@@ int bitmap_is_subset(struct bitmap *sel
        return 0;
  }
  
 -void bitmap_reset(struct bitmap *bitmap)
 -{
 -      memset(bitmap->words, 0x0, bitmap->word_alloc * sizeof(eword_t));
 -}
 -
  void bitmap_free(struct bitmap *bitmap)
  {
-       if (bitmap == NULL)
+       if (!bitmap)
                return;
  
        free(bitmap->words);

diff --cc http-push.c
Simple merge

diff --cc ll-merge.c
Simple merge

diff --cc log-tree.c
Simple merge

diff --cc mailmap.c
Simple merge

diff --cc merge-ort.c
Simple merge

diff --cc merge-recursive.c
Simple merge

diff --cc object-file.c
Simple merge

diff --cc pack-bitmap.c
Simple merge

diff --cc ref-filter.c
Simple merge

diff --cc refs/ref-cache.c
Simple merge

diff --cc reftable/stack_test.c
Simple merge

diff --cc reftable/writer.c
index 427f1317c6be6121a733fa206ce6e27ab5e029b8,ea483955e8fe6c39d3cc6f54ff97e320026cebe9..2e322a5683d081eea60fc85dfc4d792ce89b7a93
--- 1/reftable/writer.c
--- 2/reftable/writer.c
+++ b/reftable/writer.c
@@@ -255,15 -254,11 +255,15 @@@ done
  int reftable_writer_add_ref(struct reftable_writer *w,
                            struct reftable_ref_record *ref)
  {
 -      struct reftable_record rec = { NULL };
 -      struct reftable_ref_record copy = *ref;
 +      struct reftable_record rec = {
 +              .type = BLOCK_TYPE_REF,
 +              .u = {
 +                      .ref = *ref
 +              },
 +      };
        int err = 0;
  
-       if (ref->refname == NULL)
+       if (!ref->refname)
                return REFTABLE_API_ERROR;
        if (ref->update_index < w->min_update_index ||
            ref->update_index > w->max_update_index)

diff --cc rerere.c
Simple merge

diff --cc revision.c
Simple merge

diff --cc setup.c
Simple merge

diff --cc shallow.c
Simple merge

diff --cc transport.c
Simple merge

diff --cc worktree.c
Simple merge

diff --cc wrapper.c
Simple merge