Merge branch 'jc/calloc-pathspec'

* jc/calloc-pathspec:
ps_matched: xcalloc() takes nmemb and then element size

diff --combined builtin/checkout.c
index e1403bec272c332160e0346782436167fa016d93,4f826e3b034eebcc2980f935ac4096be466d5fb1..52d59eba80048f507267002a6a88135ca46376b8
--- 1/builtin/checkout.c
--- 2/builtin/checkout.c
+++ b/builtin/checkout.c
@@@ -19,6 -19,7 +19,6 @@@
  #include "ll-merge.h"
  #include "resolve-undo.h"
  #include "submodule.h"
 -#include "argv-array.h"
  
  static const char * const checkout_usage[] = {
        N_("git checkout [<options>] <branch>"),
@@@ -35,7 -36,6 +35,7 @@@ struct checkout_opts 
        int writeout_stage;
        int overwrite_ignore;
        int ignore_skipworktree;
 +      int ignore_other_worktrees;
  
        const char *new_branch;
        const char *new_branch_force;
@@@ -280,7 -280,7 +280,7 @@@ static int checkout_paths(const struct 
        if (opts->source_tree)
                read_tree_some(opts->source_tree, &opts->pathspec);
  
-       ps_matched = xcalloc(1, opts->pathspec.nr);
+       ps_matched = xcalloc(opts->pathspec.nr, 1);
  
        /*
         * Make sure all pathspecs participated in locating the paths
@@@ -441,11 -441,6 +441,11 @@@ struct branch_info 
        const char *name; /* The short name used */
        const char *path; /* The full name of a real branch */
        struct commit *commit; /* The named commit */
 +      /*
 +       * if not null the branch is detached because it's already
 +       * checked out in this checkout
 +       */
 +      char *checkout;
  };
  
  static void setup_branch_path(struct branch_info *branch)
@@@ -610,20 -605,19 +610,20 @@@ static void update_refs_for_switch(cons
        if (opts->new_branch) {
                if (opts->new_orphan_branch) {
                        if (opts->new_branch_log && !log_all_ref_updates) {
 -                              int temp;
 -                              char log_file[PATH_MAX];
 -                              char *ref_name = mkpath("refs/heads/%s", opts->new_orphan_branch);
 -
 -                              temp = log_all_ref_updates;
 -                              log_all_ref_updates = 1;
 -                              if (log_ref_setup(ref_name, log_file, sizeof(log_file))) {
 -                                      fprintf(stderr, _("Can not do reflog for '%s'\n"),
 -                                          opts->new_orphan_branch);
 -                                      log_all_ref_updates = temp;
 +                              int ret;
 +                              char *refname;
 +                              struct strbuf err = STRBUF_INIT;
 +
 +                              refname = mkpathdup("refs/heads/%s", opts->new_orphan_branch);
 +                              ret = safe_create_reflog(refname, 1, &err);
 +                              free(refname);
 +                              if (ret) {
 +                                      fprintf(stderr, _("Can not do reflog for '%s': %s\n"),
 +                                              opts->new_orphan_branch, err.buf);
 +                                      strbuf_release(&err);
                                        return;
                                }
 -                              log_all_ref_updates = temp;
 +                              strbuf_release(&err);
                        }
                }
                else
@@@ -691,10 -685,10 +691,10 @@@
  }
  
  static int add_pending_uninteresting_ref(const char *refname,
 -                                       const unsigned char *sha1,
 +                                       const struct object_id *oid,
                                         int flags, void *cb_data)
  {
 -      add_pending_sha1(cb_data, refname, sha1, UNINTERESTING);
 +      add_pending_sha1(cb_data, refname, oid->hash, UNINTERESTING);
        return 0;
  }
  
@@@ -749,17 -743,10 +749,17 @@@ static void suggest_reattach(struct com
  
        if (advice_detached_head)
                fprintf(stderr,
 -                      _(
 +                      Q_(
 +                      /* The singular version */
 +                      "If you want to keep it by creating a new branch, "
 +                      "this may be a good time\nto do so with:\n\n"
 +                      " git branch <new-branch-name> %s\n\n",
 +                      /* The plural version */
                        "If you want to keep them by creating a new branch, "
                        "this may be a good time\nto do so with:\n\n"
 -                      " git branch <new-branch-name> %s\n\n"),
 +                      " git branch <new-branch-name> %s\n\n",
 +                      /* Give ngettext() the count */
 +                      lost),
                        find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV));
  }
  
@@@ -896,11 -883,10 +896,11 @@@ static const char *unique_tracking_name
  static int parse_branchname_arg(int argc, const char **argv,
                                int dwim_new_local_branch_ok,
                                struct branch_info *new,
 -                              struct tree **source_tree,
 -                              unsigned char rev[20],
 -                              const char **new_branch)
 +                              struct checkout_opts *opts,
 +                              unsigned char rev[20])
  {
 +      struct tree **source_tree = &opts->source_tree;
 +      const char **new_branch = &opts->new_branch;
        int argcount = 0;
        unsigned char branch_rev[20];
        const char *arg;
@@@ -1100,17 -1086,6 +1100,17 @@@ static int checkout_branch(struct check
                die(_("Cannot switch branch to a non-commit '%s'"),
                    new->name);
  
 +      if (new->path && !opts->force_detach && !opts->new_branch &&
 +          !opts->ignore_other_worktrees) {
 +              unsigned char sha1[20];
 +              int flag;
 +              char *head_ref = resolve_refdup("HEAD", 0, sha1, &flag);
 +              if (head_ref &&
 +                  (!(flag & REF_ISSYMREF) || strcmp(head_ref, new->path)))
 +                      die_if_checked_out(new->path);
 +              free(head_ref);
 +      }
 +
        if (!new->commit && opts->new_branch) {
                unsigned char rev[20];
                int flag;
@@@ -1153,8 -1128,6 +1153,8 @@@ int cmd_checkout(int argc, const char *
                         N_("do not limit pathspecs to sparse entries only")),
                OPT_HIDDEN_BOOL(0, "guess", &dwim_new_local_branch,
                                N_("second guess 'git checkout <no-such-branch>'")),
 +              OPT_BOOL(0, "ignore-other-worktrees", &opts.ignore_other_worktrees,
 +                       N_("do not check if another worktree is holding the given ref")),
                OPT_END(),
        };
  
@@@ -1224,7 -1197,8 +1224,7 @@@
                        opts.track == BRANCH_TRACK_UNSPECIFIED &&
                        !opts.new_branch;
                int n = parse_branchname_arg(argc, argv, dwim_ok,
 -                                           &new, &opts.source_tree,
 -                                           rev, &opts.new_branch);
 +                                           &new, &opts, rev);
                argv += n;
                argc -= n;
        }