summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
Diffstat (limited to 'builtin')
-rw-r--r--builtin/stash.c (renamed from builtin/stash--helper.c)156
1 files changed, 89 insertions, 67 deletions
diff --git a/builtin/stash--helper.c b/builtin/stash.c
index 5f8c99c12f..d9f3956ef5 100644
--- a/builtin/stash--helper.c
+++ b/builtin/stash.c
@@ -16,75 +16,70 @@
#define INCLUDE_ALL_FILES 2
-static const char * const git_stash_helper_usage[] = {
- N_("git stash--helper list [<options>]"),
- N_("git stash--helper show [<options>] [<stash>]"),
- N_("git stash--helper drop [-q|--quiet] [<stash>]"),
- N_("git stash--helper ( pop | apply ) [--index] [-q|--quiet] [<stash>]"),
- N_("git stash--helper branch <branchname> [<stash>]"),
- N_("git stash--helper clear"),
- N_("git stash--helper [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+static const char * const git_stash_usage[] = {
+ N_("git stash list [<options>]"),
+ N_("git stash show [<options>] [<stash>]"),
+ N_("git stash drop [-q|--quiet] [<stash>]"),
+ N_("git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"),
+ N_("git stash branch <branchname> [<stash>]"),
+ N_("git stash clear"),
+ N_("git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
" [--] [<pathspec>...]]"),
- N_("git stash--helper save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+ N_("git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"),
NULL
};
-static const char * const git_stash_helper_list_usage[] = {
- N_("git stash--helper list [<options>]"),
+static const char * const git_stash_list_usage[] = {
+ N_("git stash list [<options>]"),
NULL
};
-static const char * const git_stash_helper_show_usage[] = {
- N_("git stash--helper show [<options>] [<stash>]"),
+static const char * const git_stash_show_usage[] = {
+ N_("git stash show [<options>] [<stash>]"),
NULL
};
-static const char * const git_stash_helper_drop_usage[] = {
- N_("git stash--helper drop [-q|--quiet] [<stash>]"),
+static const char * const git_stash_drop_usage[] = {
+ N_("git stash drop [-q|--quiet] [<stash>]"),
NULL
};
-static const char * const git_stash_helper_pop_usage[] = {
- N_("git stash--helper pop [--index] [-q|--quiet] [<stash>]"),
+static const char * const git_stash_pop_usage[] = {
+ N_("git stash pop [--index] [-q|--quiet] [<stash>]"),
NULL
};
-static const char * const git_stash_helper_apply_usage[] = {
- N_("git stash--helper apply [--index] [-q|--quiet] [<stash>]"),
+static const char * const git_stash_apply_usage[] = {
+ N_("git stash apply [--index] [-q|--quiet] [<stash>]"),
NULL
};
-static const char * const git_stash_helper_branch_usage[] = {
- N_("git stash--helper branch <branchname> [<stash>]"),
+static const char * const git_stash_branch_usage[] = {
+ N_("git stash branch <branchname> [<stash>]"),
NULL
};
-static const char * const git_stash_helper_clear_usage[] = {
- N_("git stash--helper clear"),
+static const char * const git_stash_clear_usage[] = {
+ N_("git stash clear"),
NULL
};
-static const char * const git_stash_helper_store_usage[] = {
- N_("git stash--helper store [-m|--message <message>] [-q|--quiet] <commit>"),
+static const char * const git_stash_store_usage[] = {
+ N_("git stash store [-m|--message <message>] [-q|--quiet] <commit>"),
NULL
};
-static const char * const git_stash_helper_create_usage[] = {
- N_("git stash--helper create [<message>]"),
- NULL
-};
-
-static const char * const git_stash_helper_push_usage[] = {
- N_("git stash--helper [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+static const char * const git_stash_push_usage[] = {
+ N_("git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
" [--] [<pathspec>...]]"),
NULL
};
-static const char * const git_stash_helper_save_usage[] = {
- N_("git stash--helper save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+static const char * const git_stash_save_usage[] = {
+ N_("git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
" [-u|--include-untracked] [-a|--all] [<message>]"),
NULL
};
@@ -220,7 +215,7 @@ static int clear_stash(int argc, const char **argv, const char *prefix)
};
argc = parse_options(argc, argv, prefix, options,
- git_stash_helper_clear_usage,
+ git_stash_clear_usage,
PARSE_OPT_STOP_AT_NON_OPTION);
if (argc)
@@ -521,7 +516,7 @@ static int apply_stash(int argc, const char **argv, const char *prefix)
};
argc = parse_options(argc, argv, prefix, options,
- git_stash_helper_apply_usage, 0);
+ git_stash_apply_usage, 0);
if (get_stash_info(&info, argc, argv))
return -1;
@@ -594,7 +589,7 @@ static int drop_stash(int argc, const char **argv, const char *prefix)
};
argc = parse_options(argc, argv, prefix, options,
- git_stash_helper_drop_usage, 0);
+ git_stash_drop_usage, 0);
if (get_stash_info(&info, argc, argv))
return -1;
@@ -620,7 +615,7 @@ static int pop_stash(int argc, const char **argv, const char *prefix)
};
argc = parse_options(argc, argv, prefix, options,
- git_stash_helper_pop_usage, 0);
+ git_stash_pop_usage, 0);
if (get_stash_info(&info, argc, argv))
return -1;
@@ -647,7 +642,7 @@ static int branch_stash(int argc, const char **argv, const char *prefix)
};
argc = parse_options(argc, argv, prefix, options,
- git_stash_helper_branch_usage, 0);
+ git_stash_branch_usage, 0);
if (!argc) {
fprintf_ln(stderr, _("No branch name specified"));
@@ -682,7 +677,7 @@ static int list_stash(int argc, const char **argv, const char *prefix)
};
argc = parse_options(argc, argv, prefix, options,
- git_stash_helper_list_usage,
+ git_stash_list_usage,
PARSE_OPT_KEEP_UNKNOWN);
if (!ref_exists(ref_stash))
@@ -762,7 +757,7 @@ static int show_stash(int argc, const char **argv, const char *prefix)
argc = setup_revisions(argc, argv, &rev, NULL);
if (argc > 1) {
free_stash_info(&info);
- usage_with_options(git_stash_helper_show_usage, options);
+ usage_with_options(git_stash_show_usage, options);
}
rev.diffopt.flags.recursive = 1;
@@ -808,7 +803,7 @@ static int store_stash(int argc, const char **argv, const char *prefix)
};
argc = parse_options(argc, argv, prefix, options,
- git_stash_helper_store_usage,
+ git_stash_store_usage,
PARSE_OPT_KEEP_UNKNOWN);
if (argc != 1) {
@@ -1221,30 +1216,19 @@ done:
static int create_stash(int argc, const char **argv, const char *prefix)
{
- int include_untracked = 0;
int ret = 0;
- const char *stash_msg = NULL;
struct strbuf stash_msg_buf = STRBUF_INIT;
struct stash_info info;
struct pathspec ps;
- struct option options[] = {
- OPT_BOOL('u', "include-untracked", &include_untracked,
- N_("include untracked files in stash")),
- OPT_STRING('m', "message", &stash_msg, N_("message"),
- N_("stash message")),
- OPT_END()
- };
- argc = parse_options(argc, argv, prefix, options,
- git_stash_helper_create_usage,
- 0);
+ /* Starting with argv[1], since argv[0] is "create" */
+ strbuf_join_argv(&stash_msg_buf, argc - 1, ++argv, ' ');
memset(&ps, 0, sizeof(ps));
if (!check_changes_tracked_files(ps))
return 0;
- strbuf_addstr(&stash_msg_buf, stash_msg);
- ret = do_create_stash(ps, &stash_msg_buf, include_untracked, 0, &info,
+ ret = do_create_stash(ps, &stash_msg_buf, 0, 0, &info,
NULL, 0);
if (!ret)
printf_ln("%s", oid_to_hex(&info.w_commit));
@@ -1476,9 +1460,10 @@ static int push_stash(int argc, const char **argv, const char *prefix)
OPT_END()
};
- argc = parse_options(argc, argv, prefix, options,
- git_stash_helper_push_usage,
- 0);
+ if (argc)
+ argc = parse_options(argc, argv, prefix, options,
+ git_stash_push_usage,
+ 0);
parse_pathspec(&ps, 0, PATHSPEC_PREFER_FULL, prefix, argv);
return do_push_stash(ps, stash_msg, quiet, keep_index, patch_mode,
@@ -1511,7 +1496,7 @@ static int save_stash(int argc, const char **argv, const char *prefix)
};
argc = parse_options(argc, argv, prefix, options,
- git_stash_helper_save_usage,
+ git_stash_save_usage,
PARSE_OPT_KEEP_DASHDASH);
if (argc)
@@ -1525,10 +1510,12 @@ static int save_stash(int argc, const char **argv, const char *prefix)
return ret;
}
-int cmd_stash__helper(int argc, const char **argv, const char *prefix)
+int cmd_stash(int argc, const char **argv, const char *prefix)
{
+ int i = -1;
pid_t pid = getpid();
const char *index_file;
+ struct argv_array args = ARGV_ARRAY_INIT;
struct option options[] = {
OPT_END()
@@ -1536,16 +1523,16 @@ int cmd_stash__helper(int argc, const char **argv, const char *prefix)
git_config(git_diff_basic_config, NULL);
- argc = parse_options(argc, argv, prefix, options, git_stash_helper_usage,
+ argc = parse_options(argc, argv, prefix, options, git_stash_usage,
PARSE_OPT_KEEP_UNKNOWN | PARSE_OPT_KEEP_DASHDASH);
index_file = get_index_file();
strbuf_addf(&stash_index_path, "%s.stash.%" PRIuMAX, index_file,
(uintmax_t)pid);
- if (argc < 1)
- usage_with_options(git_stash_helper_usage, options);
- if (!strcmp(argv[0], "apply"))
+ if (!argc)
+ return !!push_stash(0, NULL, prefix);
+ else if (!strcmp(argv[0], "apply"))
return !!apply_stash(argc, argv, prefix);
else if (!strcmp(argv[0], "clear"))
return !!clear_stash(argc, argv, prefix);
@@ -1567,7 +1554,42 @@ int cmd_stash__helper(int argc, const char **argv, const char *prefix)
return !!push_stash(argc, argv, prefix);
else if (!strcmp(argv[0], "save"))
return !!save_stash(argc, argv, prefix);
+ else if (*argv[0] != '-')
+ usage_msg_opt(xstrfmt(_("unknown subcommand: %s"), argv[0]),
+ git_stash_usage, options);
+
+ if (strcmp(argv[0], "-p")) {
+ while (++i < argc && strcmp(argv[i], "--")) {
+ /*
+ * `akpqu` is a string which contains all short options,
+ * except `-m` which is verified separately.
+ */
+ if ((strlen(argv[i]) == 2) && *argv[i] == '-' &&
+ strchr("akpqu", argv[i][1]))
+ continue;
+
+ if (!strcmp(argv[i], "--all") ||
+ !strcmp(argv[i], "--keep-index") ||
+ !strcmp(argv[i], "--no-keep-index") ||
+ !strcmp(argv[i], "--patch") ||
+ !strcmp(argv[i], "--quiet") ||
+ !strcmp(argv[i], "--include-untracked"))
+ continue;
+
+ /*
+ * `-m` and `--message=` are verified separately because
+ * they need to be immediately followed by a string
+ * (i.e.`-m"foobar"` or `--message="foobar"`).
+ */
+ if (starts_with(argv[i], "-m") ||
+ starts_with(argv[i], "--message="))
+ continue;
+
+ usage_with_options(git_stash_usage, options);
+ }
+ }
- usage_msg_opt(xstrfmt(_("unknown subcommand: %s"), argv[0]),
- git_stash_helper_usage, options);
+ argv_array_push(&args, "push");
+ argv_array_pushv(&args, argv);
+ return !!push_stash(args.argc, args.argv, prefix);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 10:53:40 +0000