development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 11:39:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'js/stash-in-c-pathspec-fix'

Browse source 
Further fixes to "git stash" reimplemented in C.

* js/stash-in-c-pathspec-fix:
  stash: pass pathspec as pointer
  built-in stash: handle :(glob) pathspecs again
  legacy stash: fix "rudimentary backport of -q"
This commit is contained in:
Junio C Hamano 2019-04-22 11:14:44 +09:00
parent 646becd773 7db9302d7c
commit 0ba1ba4846
3 changed files with 50 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
builtin/stash.c
View file

@ -828,11 +828,11 @@ static int store_stash(int argc, const char **argv, const char *prefix)
}
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);
}
/*
@ -842,7 +842,7 @@ static void add_pathspecs(struct argv_array *args,
* = 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;
@ -855,12 +855,12 @@ static int get_untracked_files(struct pathspec ps, int include_untracked,
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 */
@ -883,11 +883,12 @@ static int get_untracked_files(struct pathspec ps, int include_untracked,
* = 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))
@ -897,7 +898,7 @@ static int check_changes_tracked_files(struct pathspec ps)
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;
@ -907,22 +908,28 @@ static int check_changes_tracked_files(struct pathspec ps)
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;
@ -976,7 +983,7 @@ static int save_untracked_files(struct stash_info *info, struct strbuf *msg,
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;
@ -1035,7 +1042,7 @@ static int stash_patch(struct stash_info *info, struct pathspec ps,
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;
@ -1044,6 +1051,7 @@ static int stash_working_tree(struct stash_info *info, struct pathspec ps)
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)) {
@ -1052,7 +1060,6 @@ static int stash_working_tree(struct stash_info *info, struct pathspec ps)
}
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;
@ -1091,12 +1098,13 @@ static int stash_working_tree(struct stash_info *info, struct pathspec ps)
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)
@ -1228,10 +1236,10 @@ static int create_stash(int argc, const char **argv, const char *prefix)
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));
@ -1240,7 +1248,7 @@ static int create_stash(int argc, const char **argv, const char *prefix)
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;
@ -1260,15 +1268,15 @@ static int do_push_stash(struct pathspec ps, const char *stash_msg, int quiet,
}
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, NULL)) {
fprintf_ln(stderr, _("Did you forget to 'git add'?"));
ret = -1;
free(ps_matched);
@ -1315,7 +1323,7 @@ static int do_push_stash(struct pathspec ps, const char *stash_msg, int quiet,
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;
@ -1329,7 +1337,7 @@ static int do_push_stash(struct pathspec ps, const char *stash_msg, int quiet,
}
}
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;
@ -1468,8 +1476,9 @@ static int push_stash(int argc, const char **argv, const char *prefix)
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);
}
@ -1506,7 +1515,7 @@ static int save_stash(int argc, const char **argv, const char *prefix)
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);

8
git-legacy-stash.sh
View file

@ -86,17 +86,17 @@ maybe_quiet () {
shift
if test -n "$GIT_QUIET"
then
eval "$@" 2>/dev/null
"$@" 2>/dev/null
else
eval "$@"
"$@"
fi
;;
*)
if test -n "$GIT_QUIET"
then
eval "$@" >/dev/null 2>&1
"$@" >/dev/null 2>&1
else
eval "$@"
"$@"
fi
;;
esac

6
t/t3905-stash-include-untracked.sh
View file

@ -283,4 +283,10 @@ test_expect_success 'stash -u -- <non-existant> shows no changes when there are
test_i18ncmp expect actual
'
test_expect_success 'stash -u with globs' '
>untracked.txt &&
git stash -u -- ":(glob)**/*.txt" &&
test_path_is_missing untracked.txt
'
test_done