On 07/11, Junio C Hamano wrote:
> Thomas Gummerer <t.gummerer@xxxxxxxxx> writes:
>
> > Fix that behaviour by using 'git restore' which can faithfully restore
> > the index and working tree. This also simplifies the code.
>
> Hmph. I would have preferred to see we stayed away from 'restore'
> (and used 'checkout' instead, if you must use a Porcelain command),
> so that the "fix" can go to maintenance tracks, if distro packagers
> choose to backport it.
Fair enough. I thought this wouldn't even go to 'maint', since the
bug exists since a while, so 'git restore' would be fine, but didn't
think of distro packagers. I'm happy to use 'checkout' here instead.
> Isn't the machinery for "git status" (in wt-status.c) mature enough
> to allow us to learn what got changed all in-core, without spawning
> an external process these days, though?
Maybe, I'm not all that familar with that machinery. My longer term
hope was actually to libify the checkout machinery, and to use that
here and use that to do all this (and the 'add', 'diff-index' and
'apply' dance above) in core. But maybe it's worth looking at the
"git status" machinery for that as well?
I probably won't have enough time to do that in the next few weeks
though, so my preference would be to just use checkout for this (I'll
send an updated patch) to fix the bug in the next release. As we're
already spawning two external processes and would replace that with
just spawning one it wouldn't make anything worse at least.
Then we can try to do this all in-core at some point later, which I
think is a bit more work, and probably wouldn't be ready for the next
release (at least I won't have time to work on it).
> > 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;
> > -
> > - 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)) {
> > + struct child_process cp_restore = CHILD_PROCESS_INIT;
> > +
> > + cp_restore.git_cmd = 1;
> > + argv_array_pushl(&cp_restore.args, "restore", "--source", oid_to_hex(&info.i_tree),
> > + "--staged", "--worktree", NULL);
> > + if (!ps->nr)
> > + argv_array_push(&cp_restore.args, ".");
> > + else
> > + add_pathspecs(&cp_restore.args, ps);
> > + if (run_command(&cp_restore)) {
> > ret = -1;
> > goto done;
> > }
> > diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
> > index b22e671608..b8e337893f 100755
> > --- a/t/t3903-stash.sh
> > +++ b/t/t3903-stash.sh
> > @@ -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
