Merge branch 'js/update-index-ignore-removal-for-skip-worktree'
authorJunio C Hamano <gitster@pobox.com>
Sun, 10 Nov 2019 09:02:16 +0000 (18:02 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 10 Nov 2019 09:02:16 +0000 (18:02 +0900)
commit57b530125e022de79f5f0b208bc0a5ee67c18b77
treeb6eaafd7b203b0886aa44d3a299823cbd2eeb933
parentc22f63c40f0a576f3938dfd26c976ec052aa7fe2
parent4a58c3d7f7a83ebcd4ede635871cab7be24f7f3f
Merge branch 'js/update-index-ignore-removal-for-skip-worktree'

"git stash save" in a working tree that is sparsely checked out
mistakenly removed paths that are outside the area of interest.

* js/update-index-ignore-removal-for-skip-worktree:
  stash: handle staged changes in skip-worktree files correctly
  update-index: optionally leave skip-worktree entries alone
builtin/stash.c
builtin/update-index.c
git-legacy-stash.sh
t/t3903-stash.sh