{"thread":{"id":"63315","subject":"unwanted interaction of git stash and cherry-pick --abort","startedAt":"2025-04-20T13:18:12Z","lastAt":"2025-04-20T13:18:12Z","messageCount":1,"participants":["Markus Raab"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"516403","messageId":"13ce78d9-9afc-4bde-8c52-bbbae80cd707@markus-raab.org","threadId":"63315","inReplyTo":null,"subject":"unwanted interaction of git stash and cherry-pick --abort","fromName":"Markus Raab","fromEmail":"mailinglists@markus-raab.org","sentAt":"2025-04-20T13:18:09Z","receivedAt":"2025-04-20T13:18:12Z","isPatch":false,"sender":{"key":"mailinglists@markus-raab.org","avatar":null},"body":"Dear git maintainers,\n\nWhat did you do before the bug happened? (Steps to reproduce your issue)\n\ngit init-db\ngit commit --allow-empty # needed for git stash later\necho a > a\necho b > b\ngit add a b # some arbitrary files with content\ngit stash\ngit cherry-pick 170bbe5 # any commit that cannot be applied, e.g. the \ninitial commit here\ngit stash pop\ngit cherry-pick --abort\n\nWhat did you expect to happen? (Expected behavior)\n\nThat a and b are still there or I am somehow informed that the files a \nand b would get lost.\n\nWhat happened instead? (Actual behavior)\n\nThe files a and b are lost.\n\nWhat's different between what you expected and what actually happened?\n\nLoss of data.\n\nAnything else you want to add:\n\nEverything fine, only the content of a and b is lost ;(\n\n\n[System Info]\ngit version:\ngit version 2.39.5\ncpu: x86_64\nno commit associated with this build\nsizeof-long: 8\nsizeof-size_t: 8\nshell-path: /bin/sh\nuname: Linux 5.10.0-32-amd64 #1 SMP Debian 5.10.223-1 (2024-08-10) x86_64\ncompiler info: gnuc: 12.2\nlibc info: glibc: 2.36\n$SHELL (typically, interactive shell): /bin/zsh\n\n\n[Enabled Hooks]\n\n-- \nBest regards,\nMarkus Raab\n\n"}]}