diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-05-29 08:09:58 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-05-29 08:10:05 (GMT) |
commit | 7913f53b5628997165e075008d6142da1c04271a (patch) | |
tree | ec9ffa97b492e873118bc9e3d521b9cab63b7098 /builtin/submodule--helper.c | |
parent | e144d126d74f5d2702870ca9423743102eec6fcd (diff) | |
parent | fc54c1af3ec09bab8b8ea09768c2da4069b7f53e (diff) | |
download | git-7913f53b5628997165e075008d6142da1c04271a.zip git-7913f53b5628997165e075008d6142da1c04271a.tar.gz git-7913f53b5628997165e075008d6142da1c04271a.tar.bz2 |
Sync with Git 2.17.1
* maint: (25 commits)
Git 2.17.1
Git 2.16.4
Git 2.15.2
Git 2.14.4
Git 2.13.7
fsck: complain when .gitmodules is a symlink
index-pack: check .gitmodules files with --strict
unpack-objects: call fsck_finish() after fscking objects
fsck: call fsck_finish() after fscking objects
fsck: check .gitmodules content
fsck: handle promisor objects in .gitmodules check
fsck: detect gitmodules files
fsck: actually fsck blob data
fsck: simplify ".git" check
index-pack: make fsck error message more specific
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
...
Diffstat (limited to 'builtin/submodule--helper.c')
-rw-r--r-- | builtin/submodule--helper.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index c2403a9..df841d4 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -1825,6 +1825,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 { @@ -1850,6 +1873,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) |