Merge branch 'js/stash-apply-in-secondary-worktree'
authorJunio C Hamano <redacted>
Fri, 11 Oct 2019 05:24:48 +0000 (14:24 +0900)
committerJunio C Hamano <redacted>
Fri, 11 Oct 2019 05:24:48 +0000 (14:24 +0900)
"git stash apply" in a subdirectory of a secondary worktree failed
to access the worktree correctly, which has been corrected.

* js/stash-apply-in-secondary-worktree:
  stash apply: report status correctly even in a worktree's subdirectory

1  2 
builtin/stash.c

diff --cc builtin/stash.c
Simple merge
git clone https://git.99rst.org/PROJECT