summaryrefslogtreecommitdiffstats
path: root/contrib/persistent-https
diff options
context:
space:
mode:
authorThomas Gummerer <t.gummerer@gmail.com>2019-07-16 15:23:22 +0100
committerJunio C Hamano <gitster@pobox.com>2019-07-16 12:58:20 -0700
commitb932f6a5e8cdbb33eff4563fdfb1eae9ebf70a65 (patch)
tree5720cb6a46369f6b97e3a64960243ccadb2a19bf /contrib/persistent-https
parentb697d92f56511e804b8ba20ccbe7bdc85dc66810 (diff)
downloadgit-b932f6a5e8cdbb33eff4563fdfb1eae9ebf70a65.tar.gz
git-b932f6a5e8cdbb33eff4563fdfb1eae9ebf70a65.zip
stash: fix handling removed files with --keep-index
git stash push --keep-index is supposed to keep all changes that have been added to the index, both in the index and on disk. Currently this doesn't behave correctly when a file is removed from the index. Instead of keeping it deleted on disk, --keep-index currently restores the file. Fix that behaviour by using 'git checkout' in no-overlay mode which can faithfully restore the index and working tree. This also simplifies the code. Note that this will overwrite untracked files if the untracked file has the same name as a file that has been deleted in the index. Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/persistent-https')
0 files changed, 0 insertions, 0 deletions