Sync with Git 2.14.4
* maint-2.14: Git 2.14.4 Git 2.13.7 verify_path: disallow symlinks in .gitmodules update-index: stat updated files earlier verify_dotfile: mention case-insensitivity in comment verify_path: drop clever fallthrough skip_prefix: add case-insensitive variant is_{hfs,ntfs}_dotgitmodules: add tests is_ntfs_dotgit: match other .git files is_hfs_dotgit: match other .git files is_ntfs_dotgit: use a size_t for traversing string submodule-config: verify submodule names as paths
This commit is contained in:
@ -1242,6 +1242,29 @@ static int is_active(int argc, const char **argv, const char *prefix)
|
||||
return !is_submodule_active(the_repository, argv[1]);
|
||||
}
|
||||
|
||||
/*
|
||||
* Exit non-zero if any of the submodule names given on the command line is
|
||||
* invalid. If no names are given, filter stdin to print only valid names
|
||||
* (which is primarily intended for testing).
|
||||
*/
|
||||
static int check_name(int argc, const char **argv, const char *prefix)
|
||||
{
|
||||
if (argc > 1) {
|
||||
while (*++argv) {
|
||||
if (check_submodule_name(*argv) < 0)
|
||||
return 1;
|
||||
}
|
||||
} else {
|
||||
struct strbuf buf = STRBUF_INIT;
|
||||
while (strbuf_getline(&buf, stdin) != EOF) {
|
||||
if (!check_submodule_name(buf.buf))
|
||||
printf("%s\n", buf.buf);
|
||||
}
|
||||
strbuf_release(&buf);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
#define SUPPORT_SUPER_PREFIX (1<<0)
|
||||
|
||||
struct cmd_struct {
|
||||
@ -1263,6 +1286,7 @@ static struct cmd_struct commands[] = {
|
||||
{"push-check", push_check, 0},
|
||||
{"absorb-git-dirs", absorb_git_dirs, SUPPORT_SUPER_PREFIX},
|
||||
{"is-active", is_active, 0},
|
||||
{"check-name", check_name, 0},
|
||||
};
|
||||
|
||||
int cmd_submodule__helper(int argc, const char **argv, const char *prefix)
|
||||
|
@ -361,10 +361,9 @@ static int process_directory(const char *path, int len, struct stat *st)
|
||||
return error("%s: is a directory - add files inside instead", path);
|
||||
}
|
||||
|
||||
static int process_path(const char *path)
|
||||
static int process_path(const char *path, struct stat *st, int stat_errno)
|
||||
{
|
||||
int pos, len;
|
||||
struct stat st;
|
||||
const struct cache_entry *ce;
|
||||
|
||||
len = strlen(path);
|
||||
@ -388,13 +387,13 @@ static int process_path(const char *path)
|
||||
* First things first: get the stat information, to decide
|
||||
* what to do about the pathname!
|
||||
*/
|
||||
if (lstat(path, &st) < 0)
|
||||
return process_lstat_error(path, errno);
|
||||
if (stat_errno)
|
||||
return process_lstat_error(path, stat_errno);
|
||||
|
||||
if (S_ISDIR(st.st_mode))
|
||||
return process_directory(path, len, &st);
|
||||
if (S_ISDIR(st->st_mode))
|
||||
return process_directory(path, len, st);
|
||||
|
||||
return add_one_path(ce, path, len, &st);
|
||||
return add_one_path(ce, path, len, st);
|
||||
}
|
||||
|
||||
static int add_cacheinfo(unsigned int mode, const struct object_id *oid,
|
||||
@ -403,7 +402,7 @@ static int add_cacheinfo(unsigned int mode, const struct object_id *oid,
|
||||
int size, len, option;
|
||||
struct cache_entry *ce;
|
||||
|
||||
if (!verify_path(path))
|
||||
if (!verify_path(path, mode))
|
||||
return error("Invalid path '%s'", path);
|
||||
|
||||
len = strlen(path);
|
||||
@ -446,7 +445,17 @@ static void chmod_path(char flip, const char *path)
|
||||
|
||||
static void update_one(const char *path)
|
||||
{
|
||||
if (!verify_path(path)) {
|
||||
int stat_errno = 0;
|
||||
struct stat st;
|
||||
|
||||
if (mark_valid_only || mark_skip_worktree_only || force_remove)
|
||||
st.st_mode = 0;
|
||||
else if (lstat(path, &st) < 0) {
|
||||
st.st_mode = 0;
|
||||
stat_errno = errno;
|
||||
} /* else stat is valid */
|
||||
|
||||
if (!verify_path(path, st.st_mode)) {
|
||||
fprintf(stderr, "Ignoring path %s\n", path);
|
||||
return;
|
||||
}
|
||||
@ -467,7 +476,7 @@ static void update_one(const char *path)
|
||||
report("remove '%s'", path);
|
||||
return;
|
||||
}
|
||||
if (process_path(path))
|
||||
if (process_path(path, &st, stat_errno))
|
||||
die("Unable to process path %s", path);
|
||||
report("add '%s'", path);
|
||||
}
|
||||
@ -537,7 +546,7 @@ static void read_index_info(int nul_term_line)
|
||||
path_name = uq.buf;
|
||||
}
|
||||
|
||||
if (!verify_path(path_name)) {
|
||||
if (!verify_path(path_name, mode)) {
|
||||
fprintf(stderr, "Ignoring path %s\n", path_name);
|
||||
continue;
|
||||
}
|
||||
|
Reference in New Issue
Block a user