Merge branch 'rr/zsh-color-prompt'

diff --git a/builtin/clone.c b/builtin/clone.c
index 58fee9874f0fea4ed52acf31f757268be5383267..b6ffc6b4feb2dc56d8239cbfcea7d6467a652e6d 100644 (file)
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -18,7 +18,6 @@
 #include "transport.h"
 #include "strbuf.h"
 #include "dir.h"
-#include "pack-refs.h"
 #include "sigchain.h"
 #include "branch.h"
 #include "remote.h"
@@ -387,7 +386,7 @@ static void clone_local(const char *src_repo, const char *dest_repo)
 static const char *junk_work_tree;
 static const char *junk_git_dir;
 static pid_t junk_pid;
-enum {
+static enum {
        JUNK_LEAVE_NONE,
        JUNK_LEAVE_REPO,
        JUNK_LEAVE_ALL
@@ -783,6 +782,8 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
        is_local = option_local != 0 && path && !is_bundle;
        if (is_local && option_depth)
                warning(_("--depth is ignored in local clones; use file:// instead."));
+       if (option_local > 0 && !is_local)
+               warning(_("--local is ignored"));
 
        if (argc == 2)
                dir = xstrdup(argv[1]);