+#define USE_THE_INDEX_COMPATIBILITY_MACROS
#include "builtin.h"
#include "config.h"
#include "parse-options.h"
if (info->has_u && restore_untracked(&info->u_tree))
return error(_("could not restore untracked files from stash"));
- init_merge_options(&o);
+ init_merge_options(&o, the_repository);
o.branch1 = "Updated upstream";
o.branch2 = "Stashed changes";
return ret;
}
-static int do_drop_stash(const char *prefix, struct stash_info *info, int quiet)
+static int do_drop_stash(struct stash_info *info, int quiet)
{
int ret;
struct child_process cp_reflog = CHILD_PROCESS_INIT;
assert_stash_ref(&info);
- ret = do_drop_stash(prefix, &info, quiet);
+ ret = do_drop_stash(&info, quiet);
free_stash_info(&info);
return ret;
}
printf_ln(_("The stash entry is kept in case "
"you need it again."));
else
- ret = do_drop_stash(prefix, &info, quiet);
+ ret = do_drop_stash(&info, quiet);
free_stash_info(&info);
return ret;
if (!ret)
ret = do_apply_stash(prefix, &info, 1, 0);
if (!ret && info.is_stash_ref)
- ret = do_drop_stash(prefix, &info, 0);
+ ret = do_drop_stash(&info, 0);
free_stash_info(&info);
static int show_stash(int argc, const char **argv, const char *prefix)
{
int i;
- int opts = 0;
int ret = 0;
struct stash_info info;
struct rev_info rev;
struct argv_array stash_args = ARGV_ARRAY_INIT;
+ struct argv_array revision_args = ARGV_ARRAY_INIT;
struct option options[] = {
OPT_END()
};
git_config(git_diff_ui_config, NULL);
init_revisions(&rev, prefix);
+ argv_array_push(&revision_args, argv[0]);
for (i = 1; i < argc; i++) {
if (argv[i][0] != '-')
argv_array_push(&stash_args, argv[i]);
else
- opts++;
+ argv_array_push(&revision_args, argv[i]);
}
ret = get_stash_info(&info, stash_args.argc, stash_args.argv);
* The config settings are applied only if there are not passed
* any options.
*/
- if (!opts) {
+ if (revision_args.argc == 1) {
git_config(git_stash_config, NULL);
if (show_stat)
rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT;
}
}
- argc = setup_revisions(argc, argv, &rev, NULL);
+ argc = setup_revisions(revision_args.argc, revision_args.argv, &rev, NULL);
if (argc > 1) {
free_stash_info(&info);
usage_with_options(git_stash_show_usage, options);
}
+ if (!rev.diffopt.output_format) {
+ rev.diffopt.output_format = DIFF_FORMAT_PATCH;
+ diff_setup_done(&rev.diffopt);
+ }
rev.diffopt.flags.recursive = 1;
setup_diff_pager(&rev.diffopt);
return -1;
}
- if (get_oid_with_context(argv[0], quiet ? GET_OID_QUIETLY : 0, &obj,
+ if (get_oid_with_context(the_repository,
+ argv[0], quiet ? GET_OID_QUIETLY : 0, &obj,
&dummy)) {
if (!quiet)
fprintf_ln(stderr, _("Cannot update %s with %s"),
}
static void add_pathspecs(struct argv_array *args,
- struct pathspec ps) {
+ const struct pathspec *ps) {
int i;
- for (i = 0; i < ps.nr; i++)
- argv_array_push(args, ps.items[i].match);
+ for (i = 0; i < ps->nr; i++)
+ argv_array_push(args, ps->items[i].original);
}
/*
* = 0 if there are not any untracked files
* > 0 if there are untracked files
*/
-static int get_untracked_files(struct pathspec ps, int include_untracked,
+static int get_untracked_files(const struct pathspec *ps, int include_untracked,
struct strbuf *untracked_files)
{
int i;
if (include_untracked != INCLUDE_ALL_FILES)
setup_standard_excludes(&dir);
- seen = xcalloc(ps.nr, 1);
+ seen = xcalloc(ps->nr, 1);
- max_len = fill_directory(&dir, the_repository->index, &ps);
+ max_len = fill_directory(&dir, the_repository->index, ps);
for (i = 0; i < dir.nr; i++) {
struct dir_entry *ent = dir.entries[i];
- if (dir_path_match(&the_index, ent, &ps, max_len, seen)) {
+ if (dir_path_match(&the_index, ent, ps, max_len, seen)) {
found++;
strbuf_addstr(untracked_files, ent->name);
/* NUL-terminate: will be fed to update-index -z */
* = 0 if there are no changes.
* > 0 if there are changes.
*/
-static int check_changes_tracked_files(struct pathspec ps)
+static int check_changes_tracked_files(const struct pathspec *ps)
{
int result;
struct rev_info rev;
struct object_id dummy;
+ int ret = 0;
/* No initial commit. */
if (get_oid("HEAD", &dummy))
return -1;
init_revisions(&rev, NULL);
- rev.prune_data = ps;
+ copy_pathspec(&rev.prune_data, ps);
rev.diffopt.flags.quick = 1;
rev.diffopt.flags.ignore_submodules = 1;
diff_setup_done(&rev.diffopt);
result = run_diff_index(&rev, 1);
- if (diff_result_code(&rev.diffopt, result))
- return 1;
+ if (diff_result_code(&rev.diffopt, result)) {
+ ret = 1;
+ goto done;
+ }
object_array_clear(&rev.pending);
result = run_diff_files(&rev, 0);
- if (diff_result_code(&rev.diffopt, result))
- return 1;
+ if (diff_result_code(&rev.diffopt, result)) {
+ ret = 1;
+ goto done;
+ }
- return 0;
+done:
+ clear_pathspec(&rev.prune_data);
+ return ret;
}
/*
* The function will fill `untracked_files` with the names of untracked files
* It will return 1 if there were any changes and 0 if there were not.
*/
-static int check_changes(struct pathspec ps, int include_untracked,
+static int check_changes(const struct pathspec *ps, int include_untracked,
struct strbuf *untracked_files)
{
int ret = 0;
return ret;
}
-static int stash_patch(struct stash_info *info, struct pathspec ps,
+static int stash_patch(struct stash_info *info, const struct pathspec *ps,
struct strbuf *out_patch, int quiet)
{
int ret = 0;
return ret;
}
-static int stash_working_tree(struct stash_info *info, struct pathspec ps)
+static int stash_working_tree(struct stash_info *info, const struct pathspec *ps)
{
int ret = 0;
struct rev_info rev;
struct index_state istate = { NULL };
init_revisions(&rev, NULL);
+ copy_pathspec(&rev.prune_data, ps);
set_alternate_index_output(stash_index_path.buf);
if (reset_tree(&info->i_tree, 0, 0)) {
}
set_alternate_index_output(NULL);
- rev.prune_data = ps;
rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
rev.diffopt.format_callback = add_diff_to_buf;
rev.diffopt.format_callback_data = &diff_output;
discard_index(&istate);
UNLEAK(rev);
object_array_clear(&rev.pending);
+ clear_pathspec(&rev.prune_data);
strbuf_release(&diff_output);
remove_path(stash_index_path.buf);
return ret;
}
-static int do_create_stash(struct pathspec ps, struct strbuf *stash_msg_buf,
+static int do_create_stash(const struct pathspec *ps, struct strbuf *stash_msg_buf,
int include_untracked, int patch_mode,
struct stash_info *info, struct strbuf *patch,
int quiet)
strbuf_join_argv(&stash_msg_buf, argc - 1, ++argv, ' ');
memset(&ps, 0, sizeof(ps));
- if (!check_changes_tracked_files(ps))
+ if (!check_changes_tracked_files(&ps))
return 0;
- ret = do_create_stash(ps, &stash_msg_buf, 0, 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));
return ret;
}
-static int do_push_stash(struct pathspec ps, const char *stash_msg, int quiet,
+static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int quiet,
int keep_index, int patch_mode, int include_untracked)
{
int ret = 0;
}
read_cache_preload(NULL);
- if (!include_untracked && ps.nr) {
+ if (!include_untracked && ps->nr) {
int i;
- char *ps_matched = xcalloc(ps.nr, 1);
+ char *ps_matched = xcalloc(ps->nr, 1);
for (i = 0; i < active_nr; i++)
- ce_path_match(&the_index, active_cache[i], &ps,
+ ce_path_match(&the_index, active_cache[i], ps,
ps_matched);
- if (report_path_error(ps_matched, &ps, NULL)) {
+ if (report_path_error(ps_matched, ps)) {
fprintf_ln(stderr, _("Did you forget to 'git add'?"));
ret = -1;
free(ps_matched);
stash_msg_buf.buf);
if (!patch_mode) {
- if (include_untracked && !ps.nr) {
+ if (include_untracked && !ps->nr) {
struct child_process cp = CHILD_PROCESS_INIT;
cp.git_cmd = 1;
}
}
discard_cache();
- if (ps.nr) {
+ if (ps->nr) {
struct child_process cp_add = CHILD_PROCESS_INIT;
struct child_process cp_diff = CHILD_PROCESS_INIT;
struct child_process cp_apply = CHILD_PROCESS_INIT;
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,
+ parse_pathspec(&ps, 0, PATHSPEC_PREFER_FULL | PATHSPEC_PREFIX_ORIGIN,
+ prefix, argv);
+ return do_push_stash(&ps, stash_msg, quiet, keep_index, patch_mode,
include_untracked);
}
stash_msg = strbuf_join_argv(&stash_msg_buf, argc, argv, ' ');
memset(&ps, 0, sizeof(ps));
- ret = do_push_stash(ps, stash_msg, quiet, keep_index,
+ ret = do_push_stash(&ps, stash_msg, quiet, keep_index,
patch_mode, include_untracked);
strbuf_release(&stash_msg_buf);
{
struct child_process cp = CHILD_PROCESS_INIT;
struct strbuf out = STRBUF_INIT;
- int ret;
+ int ret, env = git_env_bool("GIT_TEST_STASH_USE_BUILTIN", -1);
+
+ if (env != -1)
+ return env;
argv_array_pushl(&cp.args,
"config", "--bool", "stash.usebuiltin", NULL);