I saw this issue a couple times in my setup, and always wondered why nobody else seemed to be hit by this. When I finally found/made some time to investigate, I found out that it really requires a specific setup: I have many worktrees connected to my main git.git clone, often run inside t/ and I do stash quite often (now that git stash's performance is a joy on Windows). Changes since v1: * We now make sure to also set GIT_DIR. Johannes Schindelin (1): stash apply: report status correctly even in a worktree's subdirectory builtin/stash.c | 4 ++++ t/t3908-stash-in-worktree.sh | 27 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100755 t/t3908-stash-in-worktree.sh base-commit: 4c86140027f4a0d2caaa3ab4bd8bfc5ce3c11c8a Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-354%2Fdscho%2Fapply-stash-in-subdirectory-v2 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-354/dscho/apply-stash-in-subdirectory-v2 Pull-Request: https://github.com/gitgitgadget/git/pull/354 Range-diff vs v1: 1: a687c16b82 ! 1: 4e19436fbf stash apply: report status correctly even in a worktree's subdirectory @@ -3,15 +3,20 @@ stash apply: report status correctly even in a worktree's subdirectory When Git wants to spawn a child Git process inside a worktree's - subdirectory, we need to take care of specifying the work tree's - top-level directory explicitly because it cannot be discovered: the - current directory is _not_ the top-level directory of the work tree, and - neither is it inside the parent directory of `GIT_DIR`. + subdirectory while `GIT_DIR` is set, we need to take care of specifying + the work tree's top-level directory explicitly because it cannot be + discovered: the current directory is _not_ the top-level directory of + the work tree, and neither is it inside the parent directory of + `GIT_DIR`. This fixes the problem where `git stash apply` would report pretty much everything deleted or untracked when run inside a worktree's subdirectory. + To make sure that we do not introduce the "reverse problem", i.e. when + `GIT_WORK_TREE` is defined but `GIT_DIR` is not, we simply make sure + that both are set. + Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx> diff --git a/builtin/stash.c b/builtin/stash.c @@ -23,6 +28,8 @@ cp.dir = prefix; + argv_array_pushf(&cp.env_array, GIT_WORK_TREE_ENVIRONMENT"=%s", + absolute_path(get_git_work_tree())); ++ argv_array_pushf(&cp.env_array, GIT_DIR_ENVIRONMENT"=%s", ++ absolute_path(get_git_dir())); argv_array_push(&cp.args, "status"); run_command(&cp); } -- gitgitgadget
