development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-12 21:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tg/stash-keep-index-with-removed-paths'

Browse source 
"git stash --keep-index" did not work correctly on paths that have
been removed, which has been fixed.

* tg/stash-keep-index-with-removed-paths:
  stash: fix handling removed files with --keep-index
This commit is contained in:
Junio C Hamano 2019-07-25 13:59:23 -07:00
parent 984da7f8d2 b932f6a5e8
commit f8aee8576a
2 changed files with 16 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
builtin/stash.c
View file

@ -1391,30 +1391,16 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q
}
if (keep_index == 1 && !is_null_oid(&info.i_tree)) {
struct child_process cp_ls = CHILD_PROCESS_INIT;
struct child_process cp_checkout = CHILD_PROCESS_INIT;
struct strbuf out = STRBUF_INIT;
struct child_process cp = CHILD_PROCESS_INIT;
if (reset_tree(&info.i_tree, 0, 1)) {
ret = -1;
goto done;
}
cp_ls.git_cmd = 1;
argv_array_pushl(&cp_ls.args, "ls-files", "-z",
"--modified", "--", NULL);
add_pathspecs(&cp_ls.args, ps);
if (pipe_command(&cp_ls, NULL, 0, &out, 0, NULL, 0)) {
ret = -1;
goto done;
}
cp_checkout.git_cmd = 1;
argv_array_pushl(&cp_checkout.args, "checkout-index",
"-z", "--force", "--stdin", NULL);
if (pipe_command(&cp_checkout, out.buf, out.len, NULL,
0, NULL, 0)) {
cp.git_cmd = 1;
argv_array_pushl(&cp.args, "checkout", "--no-overlay",
oid_to_hex(&info.i_tree), "--", NULL);
if (!ps->nr)
argv_array_push(&cp.args, ":/");
else
add_pathspecs(&cp.args, ps);
if (run_command(&cp)) {
ret = -1;
goto done;
}

7
t/t3903-stash.sh
View file

@ -1234,4 +1234,11 @@ test_expect_success 'stash works when user.name and user.email are not set' '
)
'
test_expect_success 'stash --keep-index with file deleted in index does not resurrect it on disk' '
test_commit to-remove to-remove &&
git rm to-remove &&
git stash --keep-index &&
test_path_is_missing to-remove
'
test_done