* status shows no changes but stage won't pop
@ 2025-12-02 19:23 Lipofsky, Dan -ND
2025-12-02 22:20 ` brian m. carlson
0 siblings, 1 reply; 3+ messages in thread
From: Lipofsky, Dan -ND @ 2025-12-02 19:23 UTC (permalink / raw)
To: git@vger•kernel.org
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).
status shows no changes, but stash won't pop because it says it would overwrite local changes
$ git status -u
On branch release/2.0.0
Your branch is ahead of 'origin/release/2.0.0' by 16 commits.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
$ git stash pop
error: Your local changes to the following files would be overwritten by merge:
src/main/java/com/wdpr/nge/edt/gstexpds/web/ExperienceRecordController.java
Please commit your changes or stash them before you merge.
Aborting
On branch release/2.0.0
Your branch is ahead of 'origin/release/2.0.0' by 16 commits.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
The stash entry is kept in case you need it again.
$ git version
git version 2.52.0
So how did I get here?
I did something weird (accidentally, because I was distracted with multiple windows open).
I was doing a "git rebase -i" from the command-line,
while at the same time I staged a change using Sourcetree,
and then exited the rebase (I think without actually changing anything).
I have no idea how to fix this. I tried removing and checking out the problem file, but that didn’t help.
Thanks,
Dan
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: status shows no changes but stage won't pop
2025-12-02 19:23 status shows no changes but stage won't pop Lipofsky, Dan -ND
@ 2025-12-02 22:20 ` brian m. carlson
2025-12-03 14:40 ` Lipofsky, Dan -ND
0 siblings, 1 reply; 3+ messages in thread
From: brian m. carlson @ 2025-12-02 22:20 UTC (permalink / raw)
To: Lipofsky, Dan -ND; +Cc: git@vger•kernel.org
[-- Attachment #1: Type: text/plain, Size: 1801 bytes --]
On 2025-12-02 at 19:23:53, Lipofsky, Dan -ND wrote:
> 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).
>
> status shows no changes, but stash won't pop because it says it would overwrite local changes
>
> $ git status -u
> On branch release/2.0.0
> Your branch is ahead of 'origin/release/2.0.0' by 16 commits.
> (use "git push" to publish your local commits)
>
> nothing to commit, working tree clean
>
> $ git stash pop
> error: Your local changes to the following files would be overwritten by merge:
> src/main/java/com/wdpr/nge/edt/gstexpds/web/ExperienceRecordController.java
> Please commit your changes or stash them before you merge.
> Aborting
> On branch release/2.0.0
> Your branch is ahead of 'origin/release/2.0.0' by 16 commits.
> (use "git push" to publish your local commits)
>
> nothing to commit, working tree clean
> The stash entry is kept in case you need it again.
>
> $ git version
> git version 2.52.0
>
>
> So how did I get here?
> I did something weird (accidentally, because I was distracted with multiple windows open).
> I was doing a "git rebase -i" from the command-line,
> while at the same time I staged a change using Sourcetree,
> and then exited the rebase (I think without actually changing anything).
Do you maybe have some files that are marked assume-unchanged or
skip-worktree here? I wonder if that might be causing this issue,
although I don't know for sure.
You can try this to see:
git ls-files -v | grep -v '^H'
In a normal case, I would expect to not see any output from that
command, but if one of the assume-unchanged or skip-worktree bits are
set, then you would.
--
brian m. carlson (they/them)
Toronto, Ontario, CA
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 262 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: status shows no changes but stage won't pop
2025-12-02 22:20 ` brian m. carlson
@ 2025-12-03 14:40 ` Lipofsky, Dan -ND
0 siblings, 0 replies; 3+ messages in thread
From: Lipofsky, Dan -ND @ 2025-12-03 14:40 UTC (permalink / raw)
To: brian m. carlson; +Cc: git@vger•kernel.org
On 12/2/25, 17:20, "brian m. carlson" <sandals@crustytoothpaste•net <mailto:sandals@crustytoothpaste•net>> wrote:
> Do you maybe have some files that are marked assume-unchanged or
> skip-worktree here? I wonder if that might be causing this issue,
> although I don't know for sure.
>
> You can try this to see:
>
> git ls-files -v | grep -v '^H'
>
> In a normal case, I would expect to not see any output from that
> command, but if one of the assume-unchanged or skip-worktree bits are
> set, then you would.
There is no output from that command.
Thank you,
Dan
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-12-03 14:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-12-02 19:23 status shows no changes but stage won't pop Lipofsky, Dan -ND
2025-12-02 22:20 ` brian m. carlson
2025-12-03 14:40 ` Lipofsky, Dan -ND
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox