]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ep/maint-equals-null-cocci' into ep/equals-null-cocci
authorJunio C Hamano <gitster@pobox.com>
Mon, 2 May 2022 17:15:55 +0000 (10:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 2 May 2022 17:15:55 +0000 (10:15 -0700)
* ep/maint-equals-null-cocci:
  tree-wide: apply equals-null.cocci
  tree-wide: apply equals-null.cocci
  contrib/coccinnelle: add equals-null.cocci

41 files changed:
1  2 
apply.c
archive.c
blame.c
branch.c
builtin/bisect--helper.c
builtin/checkout.c
builtin/clone.c
builtin/commit.c
builtin/diff.c
builtin/gc.c
builtin/index-pack.c
builtin/log.c
builtin/ls-remote.c
builtin/mailsplit.c
builtin/receive-pack.c
builtin/replace.c
builtin/shortlog.c
builtin/tag.c
commit-graph.c
compat/mingw.c
config.c
dir.c
http-push.c
ll-merge.c
log-tree.c
mailmap.c
merge-ort.c
merge-recursive.c
object-file.c
pack-bitmap.c
ref-filter.c
refs/ref-cache.c
reftable/stack_test.c
reftable/writer.c
rerere.c
revision.c
setup.c
shallow.c
transport.c
worktree.c
wrapper.c

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
+++ 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;
Simple merge
Simple merge
diff --cc builtin/clone.c
Simple merge
Simple merge
diff --cc builtin/diff.c
Simple merge
diff --cc builtin/gc.c
Simple merge
Simple merge
diff --cc builtin/log.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
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 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
Simple merge
diff --cc object-file.c
Simple merge
diff --cc pack-bitmap.c
Simple merge
diff --cc ref-filter.c
Simple merge
Simple merge
Simple merge
index 427f1317c6be6121a733fa206ce6e27ab5e029b8,ea483955e8fe6c39d3cc6f54ff97e320026cebe9..2e322a5683d081eea60fc85dfc4d792ce89b7a93
@@@ -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