Skip to content
Permalink
Browse files

Merge branch 'core-longpaths-everywhere'

Git for Windows supports the core.longPaths config setting to allow
writing/reading long paths via the \\?\ trick for a long time now.

However, for that support to work, it is absolutely necessary that
git_default_config() is given a chance to parse the config. Otherwise
Git will be non the wiser.

So let's make sure that as many commands that previously failed to
parse the core.* settings now do that, implicitly enabling long path
support in a lot more places.

Note: this is not a perfect solution, and it cannot be, as there is
a chicken-and-egg problem in reading the config itself...

This fixes #1218

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  • Loading branch information...
dscho committed Sep 5, 2017
2 parents 8251787 + d8aa5c1 commit 036918aff7265984055b613d7c9df5bee9507e6b
@@ -9,6 +9,7 @@
#include "parse-options.h"
#include "pkt-line.h"
#include "sideband.h"
#include "config.h"

static void create_output_file(const char *output_file)
{
@@ -94,6 +95,7 @@ int cmd_archive(int argc, const char **argv, const char *prefix)
OPT_END()
};

git_config(git_default_config, NULL);
argc = parse_options(argc, argv, prefix, local_opts, NULL,
PARSE_OPT_KEEP_ALL);

@@ -2,6 +2,7 @@
#include "cache.h"
#include "parse-options.h"
#include "bisect.h"
#include "config.h"

static const char * const git_bisect_helper_usage[] = {
N_("git bisect--helper --next-all [--no-checkout]"),
@@ -20,6 +21,7 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
OPT_END()
};

git_config(git_default_config, NULL);
argc = parse_options(argc, argv, prefix, options,
git_bisect_helper_usage, 0);

@@ -1,6 +1,7 @@
#include "builtin.h"
#include "cache.h"
#include "bundle.h"
#include "config.h"

/*
* Basic handler for bundle files to connect repositories via sneakernet.
@@ -21,6 +22,7 @@ int cmd_bundle(int argc, const char **argv, const char *prefix)
const char *cmd, *bundle_file;
int bundle_fd = -1;

git_config(git_default_config, NULL);
if (argc < 3)
usage(builtin_bundle_usage);

@@ -6,6 +6,7 @@
#include "refs.h"
#include "builtin.h"
#include "strbuf.h"
#include "config.h"

static const char builtin_check_ref_format_usage[] =
"git check-ref-format [--normalize] [<options>] <refname>\n"
@@ -55,6 +56,7 @@ int cmd_check_ref_format(int argc, const char **argv, const char *prefix)
int flags = 0;
const char *refname;

git_config(git_default_config, NULL);
if (argc == 2 && !strcmp(argv[1], "-h"))
usage(builtin_check_ref_format_usage);

@@ -882,6 +882,8 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
struct refspec *refspec;
const char *fetch_pattern;

git_config(platform_core_config, NULL);

packet_trace_identity("clone");
argc = parse_options(argc, argv, prefix, builtin_clone_options,
builtin_clone_usage, 0);
@@ -34,6 +34,8 @@ int cmd_column(int argc, const char **argv, const char *prefix)
OPT_END()
};

git_config(platform_core_config, NULL);

/* This one is special and must be the first one */
if (argc > 1 && starts_with(argv[1], "--command=")) {
command = argv[1] + 10;
@@ -1,6 +1,7 @@
#include "git-compat-util.h"
#include "credential.h"
#include "builtin.h"
#include "config.h"

static const char usage_msg[] =
"git credential [fill|approve|reject]";
@@ -10,6 +11,8 @@ int cmd_credential(int argc, const char **argv, const char *prefix)
const char *op;
struct credential c = CREDENTIAL_INIT;

git_config(git_default_config, NULL);

if (argc != 2 || !strcmp(argv[1], "-h"))
usage(usage_msg);
op = argv[1];
@@ -4,6 +4,7 @@
#include "remote.h"
#include "connect.h"
#include "sha1-array.h"
#include "config.h"

static const char fetch_pack_usage[] =
"git fetch-pack [--all] [--stdin] [--quiet | -q] [--keep | -k] [--thin] "
@@ -53,6 +54,8 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
struct oid_array shallow = OID_ARRAY_INIT;
struct string_list deepen_not = STRING_LIST_INIT_DUP;

git_config(git_default_config, NULL);

packet_trace_identity("fetch-pack");

memset(&args, 0, sizeof(args));
@@ -6,6 +6,7 @@
#include "tar.h"
#include "builtin.h"
#include "quote.h"
#include "config.h"

static const char builtin_get_tar_commit_id_usage[] =
"git get-tar-commit-id";
@@ -25,6 +26,7 @@ int cmd_get_tar_commit_id(int argc, const char **argv, const char *prefix)
if (argc != 1)
usage(builtin_get_tar_commit_id_usage);

git_config(git_default_config, NULL);
n = read_in_full(0, buffer, HEADERSIZE);
if (n < HEADERSIZE)
die("git get-tar-commit-id: read error");
@@ -155,7 +155,7 @@ static int git_init_db_config(const char *k, const char *v, void *cb)
return git_config_pathname(&init_db_template_dir, k, v);

if (starts_with(k, "core."))
return platform_core_config(k, v);
return platform_core_config(k, v, cb);

return 0;
}
@@ -10,6 +10,7 @@
#include "parse-options.h"
#include "string-list.h"
#include "trailer.h"
#include "config.h"

static const char * const git_interpret_trailers_usage[] = {
N_("git interpret-trailers [--in-place] [--trim-empty] [(--trailer <token>[(=|:)<value>])...] [<file>...]"),
@@ -30,6 +31,7 @@ int cmd_interpret_trailers(int argc, const char **argv, const char *prefix)
OPT_END()
};

git_config(git_default_config, NULL);
argc = parse_options(argc, argv, prefix, options,
git_interpret_trailers_usage, 0);

@@ -1881,6 +1881,7 @@ int cmd_cherry(int argc, const char **argv, const char *prefix)
OPT_END()
};

git_config(git_default_config, NULL);
argc = parse_options(argc, argv, prefix, options, cherry_usage, 0);

switch (argc) {
@@ -2,6 +2,7 @@
#include "cache.h"
#include "transport.h"
#include "remote.h"
#include "config.h"

static const char * const ls_remote_usage[] = {
N_("git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -71,6 +72,7 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
PARSE_OPT_STOP_AT_NON_OPTION);
dest = argv[0];

git_config(git_default_config, NULL);
if (argc > 1) {
int i;
pattern = xcalloc(argc, sizeof(const char *));
@@ -7,6 +7,7 @@
#include "utf8.h"
#include "strbuf.h"
#include "mailinfo.h"
#include "config.h"

static const char mailinfo_usage[] =
"git mailinfo [-k | -b] [-m | --message-id] [-u | --encoding=<encoding> | -n] [--scissors | --no-scissors] <msg> <patch> < mail >info";
@@ -18,6 +19,7 @@ int cmd_mailinfo(int argc, const char **argv, const char *prefix)
int status;
char *msgfile, *patchfile;

git_config(git_default_config, NULL);
setup_mailinfo(&mi);

def_charset = get_commit_output_encoding();
@@ -8,6 +8,7 @@
#include "builtin.h"
#include "string-list.h"
#include "strbuf.h"
#include "config.h"

static const char git_mailsplit_usage[] =
"git mailsplit [-d<prec>] [-f<n>] [-b] [--keep-cr] -o<directory> [(<mbox>|<Maildir>)...]";
@@ -276,6 +277,7 @@ int cmd_mailsplit(int argc, const char **argv, const char *prefix)
const char **argp;
static const char *stdin_only[] = { "-", NULL };

git_config(git_default_config, NULL);
for (argp = argv+1; *argp; argp++) {
const char *arg = *argp;

@@ -1,5 +1,6 @@
#include "builtin.h"
#include "run-command.h"
#include "config.h"

static const char *pgm;
static int one_shot, quiet;
@@ -74,6 +75,8 @@ int cmd_merge_index(int argc, const char **argv, const char *prefix)
*/
signal(SIGCHLD, SIG_DFL);

git_config(git_default_config, NULL);

if (argc < 3)
usage("git merge-index [-o] [-q] <merge-program> (-a | [--] [<filename>...])");

@@ -4,6 +4,7 @@
#include "blob.h"
#include "exec_cmd.h"
#include "merge-blobs.h"
#include "config.h"

static const char merge_tree_usage[] = "git merge-tree <base-tree> <branch1> <branch2>";

@@ -366,6 +367,7 @@ int cmd_merge_tree(int argc, const char **argv, const char *prefix)
if (argc != 4)
usage(merge_tree_usage);

git_config(git_default_config, NULL);
buf1 = get_tree_descriptor(t+0, argv[1]);
buf2 = get_tree_descriptor(t+1, argv[2]);
buf3 = get_tree_descriptor(t+2, argv[3]);
@@ -1,5 +1,6 @@
#include "builtin.h"
#include "tag.h"
#include "config.h"

/*
* A signature file has a very simple fixed format: four lines
@@ -156,6 +157,7 @@ int cmd_mktag(int argc, const char **argv, const char *prefix)
if (argc != 1)
usage("git mktag");

git_config(git_default_config, NULL);
if (strbuf_read(&buf, 0, 4096) < 0) {
die_errno("could not read from stdin");
}
@@ -7,6 +7,7 @@
#include "quote.h"
#include "tree.h"
#include "parse-options.h"
#include "config.h"

static struct treeent {
unsigned mode;
@@ -156,6 +157,7 @@ int cmd_mktree(int ac, const char **av, const char *prefix)
OPT_END()
};

git_config(git_default_config, NULL);
ac = parse_options(ac, av, prefix, option, mktree_usage, 0);
getline_fn = nul_term_line ? strbuf_getline_nul : strbuf_getline_lf;

@@ -1,6 +1,7 @@
#include "builtin.h"
#include "parse-options.h"
#include "refs.h"
#include "config.h"

static char const * const pack_refs_usage[] = {
N_("git pack-refs [<options>]"),
@@ -15,6 +16,7 @@ int cmd_pack_refs(int argc, const char **argv, const char *prefix)
OPT_BIT(0, "prune", &flags, N_("prune loose refs (default)"), PACK_REFS_PRUNE),
OPT_END(),
};
git_config(git_default_config, NULL);
if (parse_options(argc, argv, prefix, opts, pack_refs_usage, 0))
usage_with_options(pack_refs_usage, opts);
return refs_pack_refs(get_main_ref_store(), flags);
@@ -2,6 +2,7 @@
#include "cache.h"
#include "progress.h"
#include "parse-options.h"
#include "config.h"

static const char * const prune_packed_usage[] = {
N_("git prune-packed [-n | --dry-run] [-q | --quiet]"),
@@ -59,6 +60,7 @@ int cmd_prune_packed(int argc, const char **argv, const char *prefix)
OPT_END()
};

git_config(git_default_config, NULL);
argc = parse_options(argc, argv, prefix, prune_packed_options,
prune_packed_usage, 0);

@@ -6,6 +6,7 @@
#include "reachable.h"
#include "parse-options.h"
#include "progress.h"
#include "config.h"

static const char * const prune_usage[] = {
N_("git prune [-n] [-v] [--expire <time>] [--] [<head>...]"),
@@ -111,6 +112,8 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
};
char *s;

git_config(git_default_config, NULL);

expire = TIME_MAX;
save_commit_buffer = 0;
check_replace_refs = 0;
@@ -728,6 +728,7 @@ static const char reflog_usage[] =

int cmd_reflog(int argc, const char **argv, const char *prefix)
{
git_config(git_default_config, NULL);
if (argc > 1 && !strcmp(argv[1], "-h"))
usage(reflog_usage);

@@ -2,6 +2,7 @@
#include "transport.h"
#include "run-command.h"
#include "pkt-line.h"
#include "config.h"

static const char usage_msg[] =
"git remote-ext <remote> <url>";
@@ -198,5 +199,6 @@ int cmd_remote_ext(int argc, const char **argv, const char *prefix)
if (argc != 3)
usage(usage_msg);

git_config(git_default_config, NULL);
return command_loop(argv[2]);
}
@@ -1599,6 +1599,7 @@ int cmd_remote(int argc, const char **argv, const char *prefix)
};
int result;

git_config(git_default_config, NULL);
argc = parse_options(argc, argv, prefix, options, builtin_remote_usage,
PARSE_OPT_STOP_AT_NON_OPTION);

@@ -411,6 +411,7 @@ static int cmd_parseopt(int argc, const char **argv, const char *prefix)
struct option *opts = NULL;
int onb = 0, osz = 0, unb = 0, usz = 0;

git_config(git_default_config, NULL);
strbuf_addstr(&parsed, "set --");
argc = parse_options(argc, argv, prefix, parseopt_opts, parseopt_usage,
PARSE_OPT_KEEP_DASHDASH);
@@ -120,7 +120,7 @@ static int send_pack_config(const char *k, const char *v, void *cb)
}
}
}
return 0;
return git_default_config(k, v, cb);
}

int cmd_send_pack(int argc, const char **argv, const char *prefix)
@@ -5,6 +5,7 @@
#include "tag.h"
#include "string-list.h"
#include "parse-options.h"
#include "config.h"

static const char * const show_ref_usage[] = {
N_("git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"),
@@ -180,6 +181,7 @@ static const struct option show_ref_options[] = {

int cmd_show_ref(int argc, const char **argv, const char *prefix)
{
git_config(git_default_config, NULL);
argc = parse_options(argc, argv, prefix, show_ref_options,
show_ref_usage, 0);

0 comments on commit 036918a

Please sign in to comment.
You can’t perform that action at this time.