{"thread":{"id":"57035","subject":"Git stash pop with untracked files doesn't unpack untracked if a conflict happens","startedAt":"2021-12-05T19:03:14Z","lastAt":"2021-12-05T19:03:14Z","messageCount":1,"participants":["Anastasios Andronidis"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"443110","messageId":"52179A8B-CAA8-4729-9BD6-C297CD00BF08@gmail.com","threadId":"57035","inReplyTo":null,"subject":"Git stash pop with untracked files doesn't unpack untracked if a conflict happens","fromName":"Anastasios Andronidis","fromEmail":"anastasios.andronidis@gmail.com","sentAt":"2021-12-05T19:03:07Z","receivedAt":"2021-12-05T19:03:14Z","isPatch":false,"sender":{"key":"anastasios.andronidis@gmail.com","avatar":null},"body":"Dear team,\n\nI want to report some weird behaviour regarding git stash pop and untracked files committed with git stash -u. See the git report below:\n\nThank you for filling out a Git bug report!\nPlease answer the following questions to help us understand your issue.\n\nWhat did you do before the bug happened? (Steps to reproduce your issue)\n\n1) Created an empty git repo: `git init`\n2) Created 1 commit with a single file: `echo \"test\" >test.txt && git commit -a -m \"init\"`\n3) Made some changes in the file i committed + created a new file: `echo \"test2\" >test.txt && echo \"test2\" >test2.txt`\n4) Used stash -u to save my changes: `git stash -u`\n5) Created a second commit with a different change on the existing file in order to force a conflict: `echo \"test3\" >test.txt && git commit -a -m \"2\"`\n6) I git stash pop to create a conflict between the second commit and my stash from my first commit: `git stash pop`\n\nWhat did you expect to happen? (Expected behavior)\n\nI was expecting to have 1 file in conflict stage and the untracked file to be created in my current working directory.\n\nWhat happened instead? (Actual behavior)\n\nThe untracked file is missing.\n\nWhat's different between what you expected and what actually happened?\n\nThe untracked file is missing.\n\nAnything else you want to add:\n\nN/A\n\nPlease review the rest of the bug report below.\nYou can delete any lines you don't wish to share.\n\n\n[System Info]\ngit version:\ngit version 2.34.1\ncpu: x86_64\nno commit associated with this build\nsizeof-long: 8\nsizeof-size_t: 8\nshell-path: /bin/sh\nuname: Darwin 21.1.0 Darwin Kernel Version 21.1.0: Wed Oct 13 17:33:23 PDT 2021; root:xnu-8019.41.5~1/RELEASE_X86_64 x86_64\ncompiler info: clang: 13.0.0 (clang-1300.0.29.3)\nlibc info: no libc information available\n$SHELL (typically, interactive shell): /bin/zsh\n\n\n[Enabled Hooks]\n\n\nKindly,\nAnastasios\nAndronidis\n\n\n"}]}