{"thread":{"id":"64571","subject":"status shows no changes but stage won't pop","startedAt":"2025-12-02T20:20:41Z","lastAt":"2025-12-03T14:41:00Z","messageCount":3,"participants":["Lipofsky, Dan -ND","brian m. carlson"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"531584","messageId":"95EA2230-530D-4EB5-AF19-ADED54976F17@disney.com","threadId":"64571","inReplyTo":null,"subject":"status shows no changes but stage won't pop","fromName":"Lipofsky, Dan -ND","fromEmail":"dan.lipofsky.-nd@disney.com","sentAt":"2025-12-02T19:23:53Z","receivedAt":"2025-12-02T20:20:41Z","isPatch":false,"sender":{"key":"dan.lipofsky.-nd@disney.com","avatar":null},"body":"I believe I've uncovered a weird bug in the git client (2.49.0 and 2.52.0, installed with brew on MacOS 15.6.1).\n\nstatus shows no changes, but stash won't pop because it says it would overwrite local changes\n\n$ git status -u\nOn branch release/2.0.0\nYour branch is ahead of 'origin/release/2.0.0' by 16 commits.\n (use \"git push\" to publish your local commits)\n\nnothing to commit, working tree clean\n\n$ git stash pop\nerror: Your local changes to the following files would be overwritten by merge:\n\tsrc/main/java/com/wdpr/nge/edt/gstexpds/web/ExperienceRecordController.java\nPlease commit your changes or stash them before you merge.\nAborting\nOn branch release/2.0.0\nYour branch is ahead of 'origin/release/2.0.0' by 16 commits.\n (use \"git push\" to publish your local commits)\n\nnothing to commit, working tree clean\nThe stash entry is kept in case you need it again.\n\n$ git version\ngit version 2.52.0\n\n\nSo how did I get here?\nI did something weird (accidentally, because I was distracted with multiple windows open).\nI was doing a \"git rebase -i\" from the command-line,\nwhile at the same time I staged a change using Sourcetree,\nand then exited the rebase (I think without actually changing anything).\n\n\nI have no idea how to fix this. I tried removing and checking out the problem file, but that didn’t help.\n\n\nThanks,\nDan\n\n\n\n"},{"id":"531589","messageId":"aS9mNdJSJP49-V4Q@fruit.crustytoothpaste.net","threadId":"64571","inReplyTo":"95EA2230-530D-4EB5-AF19-ADED54976F17@disney.com","subject":"Re: status shows no changes but stage won't pop","fromName":"brian m. carlson","fromEmail":"sandals@crustytoothpaste.net","sentAt":"2025-12-02T22:20:37Z","receivedAt":"2025-12-02T22:20:39Z","isPatch":false,"sender":{"key":"sandals@crustytoothpaste.net","avatar":"https://avatars.githubusercontent.com/u/497054?v=4"},"body":"On 2025-12-02 at 19:23:53, Lipofsky, Dan -ND wrote:\n> I believe I've uncovered a weird bug in the git client (2.49.0 and 2.52.0, installed with brew on MacOS 15.6.1).\n> \n> status shows no changes, but stash won't pop because it says it would overwrite local changes\n> \n> $ git status -u\n> On branch release/2.0.0\n> Your branch is ahead of 'origin/release/2.0.0' by 16 commits.\n> (use \"git push\" to publish your local commits)\n> \n> nothing to commit, working tree clean\n> \n> $ git stash pop\n> error: Your local changes to the following files would be overwritten by merge:\n> \tsrc/main/java/com/wdpr/nge/edt/gstexpds/web/ExperienceRecordController.java\n> Please commit your changes or stash them before you merge.\n> Aborting\n> On branch release/2.0.0\n> Your branch is ahead of 'origin/release/2.0.0' by 16 commits.\n> (use \"git push\" to publish your local commits)\n> \n> nothing to commit, working tree clean\n> The stash entry is kept in case you need it again.\n> \n> $ git version\n> git version 2.52.0\n> \n> \n> So how did I get here?\n> I did something weird (accidentally, because I was distracted with multiple windows open).\n> I was doing a \"git rebase -i\" from the command-line,\n> while at the same time I staged a change using Sourcetree,\n> and then exited the rebase (I think without actually changing anything).\n\nDo you maybe have some files that are marked assume-unchanged or\nskip-worktree here? I wonder if that might be causing this issue,\nalthough I don't know for sure.\n\nYou can try this to see:\n\n git ls-files -v | grep -v '^H'\n\nIn a normal case, I would expect to not see any output from that\ncommand, but if one of the assume-unchanged or skip-worktree bits are\nset, then you would.\n-- \nbrian m. carlson (they/them)\nToronto, Ontario, CA\n"},{"id":"531622","messageId":"30A402A0-589B-4B0F-A7DD-E732FE738986@disney.com","threadId":"64571","inReplyTo":"aS9mNdJSJP49-V4Q@fruit.crustytoothpaste.net","subject":"Re: status shows no changes but stage won't pop","fromName":"Lipofsky, Dan -ND","fromEmail":"dan.lipofsky.-nd@disney.com","sentAt":"2025-12-03T14:40:51Z","receivedAt":"2025-12-03T14:41:00Z","isPatch":false,"sender":{"key":"dan.lipofsky.-nd@disney.com","avatar":null},"body":"On 12/2/25, 17:20, \"brian m. carlson\" > wrote:\n> Do you maybe have some files that are marked assume-unchanged or\n> skip-worktree here? I wonder if that might be causing this issue,\n> although I don't know for sure.\n> \n> You can try this to see:\n> \n> git ls-files -v | grep -v '^H'\n> \n> In a normal case, I would expect to not see any output from that\n> command, but if one of the assume-unchanged or skip-worktree bits are\n> set, then you would.\n\nThere is no output from that command.\n\nThank you,\nDan\n\n"}]}