Merge branch 'nd/clone-no-separate-git-dir-with-bare'

Forbid a useless combination of options to "git clone".

* nd/clone-no-separate-git-dir-with-bare:
clone: forbid --bare --separate-git-dir <dir>

diff --combined builtin/clone.c
index 8d23a62e8a1b875f1415f78a4c283f4cdefac011,b66766f8c9d1e47333b21f223e1e8285173d28d6..36ec99db3f5a7dbd59705aa68bcd592c08c773cd
--- 1/builtin/clone.c
--- 2/builtin/clone.c
+++ b/builtin/clone.c
@@@ -33,7 -33,7 +33,7 @@@
   *
   */
  static const char * const builtin_clone_usage[] = {
 -      "git clone [options] [--] <repo> [<dir>]",
 +      N_("git clone [options] [--] <repo> [<dir>]"),
        NULL
  };
  
@@@ -61,43 -61,43 +61,43 @@@ static int opt_parse_reference(const st
  static struct option builtin_clone_options[] = {
        OPT__VERBOSITY(&option_verbosity),
        OPT_BOOL(0, "progress", &option_progress,
 -               "force progress reporting"),
 +               N_("force progress reporting")),
        OPT_BOOLEAN('n', "no-checkout", &option_no_checkout,
 -                  "don't create a checkout"),
 -      OPT_BOOLEAN(0, "bare", &option_bare, "create a bare repository"),
 +                  N_("don't create a checkout")),
 +      OPT_BOOLEAN(0, "bare", &option_bare, N_("create a bare repository")),
        { OPTION_BOOLEAN, 0, "naked", &option_bare, NULL,
 -              "create a bare repository",
 +              N_("create a bare repository"),
                PARSE_OPT_NOARG | PARSE_OPT_HIDDEN },
        OPT_BOOLEAN(0, "mirror", &option_mirror,
 -                  "create a mirror repository (implies bare)"),
 +                  N_("create a mirror repository (implies bare)")),
        OPT_BOOL('l', "local", &option_local,
 -              "to clone from a local repository"),
 +              N_("to clone from a local repository")),
        OPT_BOOLEAN(0, "no-hardlinks", &option_no_hardlinks,
 -                  "don't use local hardlinks, always copy"),
 +                  N_("don't use local hardlinks, always copy")),
        OPT_BOOLEAN('s', "shared", &option_shared,
 -                  "setup as shared repository"),
 +                  N_("setup as shared repository")),
        OPT_BOOLEAN(0, "recursive", &option_recursive,
 -                  "initialize submodules in the clone"),
 +                  N_("initialize submodules in the clone")),
        OPT_BOOLEAN(0, "recurse-submodules", &option_recursive,
 -                  "initialize submodules in the clone"),
 -      OPT_STRING(0, "template", &option_template, "template-directory",
 -                 "directory from which templates will be used"),
 -      OPT_CALLBACK(0 , "reference", &option_reference, "repo",
 -                   "reference repository", &opt_parse_reference),
 -      OPT_STRING('o', "origin", &option_origin, "name",
 -                 "use <name> instead of 'origin' to track upstream"),
 -      OPT_STRING('b', "branch", &option_branch, "branch",
 -                 "checkout <branch> instead of the remote's HEAD"),
 -      OPT_STRING('u', "upload-pack", &option_upload_pack, "path",
 -                 "path to git-upload-pack on the remote"),
 -      OPT_STRING(0, "depth", &option_depth, "depth",
 -                  "create a shallow clone of that depth"),
 +                  N_("initialize submodules in the clone")),
 +      OPT_STRING(0, "template", &option_template, N_("template-directory"),
 +                 N_("directory from which templates will be used")),
 +      OPT_CALLBACK(0 , "reference", &option_reference, N_("repo"),
 +                   N_("reference repository"), &opt_parse_reference),
 +      OPT_STRING('o', "origin", &option_origin, N_("name"),
 +                 N_("use <name> instead of 'origin' to track upstream")),
 +      OPT_STRING('b', "branch", &option_branch, N_("branch"),
 +                 N_("checkout <branch> instead of the remote's HEAD")),
 +      OPT_STRING('u', "upload-pack", &option_upload_pack, N_("path"),
 +                 N_("path to git-upload-pack on the remote")),
 +      OPT_STRING(0, "depth", &option_depth, N_("depth"),
 +                  N_("create a shallow clone of that depth")),
        OPT_BOOL(0, "single-branch", &option_single_branch,
 -                  "clone only one branch, HEAD or --branch"),
 -      OPT_STRING(0, "separate-git-dir", &real_git_dir, "gitdir",
 -                 "separate git dir from working tree"),
 -      OPT_STRING_LIST('c', "config", &option_config, "key=value",
 -                      "set config inside the new repository"),
 +                  N_("clone only one branch, HEAD or --branch")),
 +      OPT_STRING(0, "separate-git-dir", &real_git_dir, N_("gitdir"),
 +                 N_("separate git dir from working tree")),
 +      OPT_STRING_LIST('c', "config", &option_config, N_("key=value"),
 +                      N_("set config inside the new repository")),
        OPT_END()
  };
  
@@@ -236,7 -236,7 +236,7 @@@ static int add_one_reference(struct str
        /* Beware: real_path() and mkpath() return static buffer */
        ref_git = xstrdup(real_path(item->string));
        if (is_directory(mkpath("%s/.git/objects", ref_git))) {
 -              char *ref_git_git = xstrdup(mkpath("%s/.git", ref_git));
 +              char *ref_git_git = mkpathdup("%s/.git", ref_git);
                free(ref_git);
                ref_git = ref_git_git;
        } else if (!is_directory(mkpath("%s/objects", ref_git)))
@@@ -704,6 -704,8 +704,8 @@@ int cmd_clone(int argc, const char **ar
                if (option_origin)
                        die(_("--bare and --origin %s options are incompatible."),
                            option_origin);
+               if (real_git_dir)
+                       die(_("--bare and --separate-git-dir are incompatible."));
                option_no_checkout = 1;
        }
  
@@@ -748,7 -750,7 +750,7 @@@
                git_dir = xstrdup(dir);
        else {
                work_tree = dir;
 -              git_dir = xstrdup(mkpath("%s/.git", dir));
 +              git_dir = mkpathdup("%s/.git", dir);
        }
  
        if (!option_bare) {
@@@ -771,10 -773,8 +773,10 @@@
                die(_("could not create leading directories of '%s'"), git_dir);
  
        set_git_dir_init(git_dir, real_git_dir, 0);
 -      if (real_git_dir)
 +      if (real_git_dir) {
                git_dir = real_git_dir;
 +              junk_git_dir = real_git_dir;
 +      }
  
        if (0 <= option_verbosity) {
                if (option_bare)