summaryrefslogtreecommitdiff
path: root/t/t4135/funny-tz.diff
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2021-09-10 10:29:56 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-09-10 15:46:34 -0700
commitbee8691f197ae6b74ca26081c1a3fa218e2b9db7 (patch)
treef486e82d5bdbe825cdc62929289d76a682ca4024 /t/t4135/funny-tz.diff
parentstash: avoid feeding directories to update-index (diff)
downloadtgif-bee8691f197ae6b74ca26081c1a3fa218e2b9db7.tar.xz
stash: restore untracked files AFTER restoring tracked files
If a user deletes a file and places a directory of untracked files there, then stashes all these changes, the untracked directory of files cannot be restored until after the corresponding file in the way is removed. So, restore changes to tracked files before restoring untracked files. There is no counterpart problem to worry about with the user deleting an untracked file and then add a tracked one in its place. Git does not track untracked files, and so will not know the untracked file was deleted, and thus won't be able to stash the removal of that file. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4135/funny-tz.diff')
0 files changed, 0 insertions, 0 deletions