Git：删除损坏的存储

Question

I've got a broken stash:

% git stash drop            
fatal: log for refs/stash is empty
% cat .git/logs/refs/stash
%

It does show up in git log --all , though:

% lal

*   f32cdce - (HEAD -> develop, origin/develop) (44 minutes ago) <Williams, Ken>
|\  
| * 05cc7d3 - (3 weeks ago) <Ken Williams>
| * 6d9c8ae - (3 weeks ago) <Ken Williams>
| | * 3fb311d - (refs/stash) (3 weeks ago) <Ken Williams>
| |/| 
| | * 19be16e - (3 weeks ago) <Ken Williams>
| |/  
| * ffea5e2 - (i2) (9 weeks ago) <Ken Williams>

( lal is my alias for git log --graph --pretty=format:'%h -%C(yellow)%d%Creset %Cgreen(%ad) %C(bold blue)<%an>%Creset' --all .)

I did a git stash apply 3fb311d , so I've got the content of the stash secured. Now, how can I remove that refs/stash from the tree so it doesn't keep complaining?

EDIT

Even after deleting the refs/stash reference as suggested by @mark-adelsberger, the commits show up in the history listing:

% lal

*   f32cdce - (HEAD -> develop, origin/develop) (31 hours ago) <Williams, Ken>
|\  
| * 05cc7d3 - (3 weeks ago) <Ken Williams>
| * 6d9c8ae - (3 weeks ago) <Ken Williams>
| | * 3fb311d - (3 weeks ago) <Ken Williams>
| |/| 
| | * 19be16e - (3 weeks ago) <Ken Williams>
| |/  
| * ffea5e2 - (i2) (9 weeks ago) <Ken Williams>
| * 199af47 - (9 weeks ago) <Ken Williams>
...

This is using Git 2.29.0 (homebrew) on OS X 10.15.7.

Answer 1

Update - Added notes at end based on edited question

---

If .git/refs/stash is empty (or non-existant) yet git log shows a refs/stash , then I would suspect the stash ref got added to your packed-refs file somehow.

You can confirm the existence of the ref (regardless of its representation on disk) with

git for-each-ref refs/stash

and if this shows refs/stash (as I think it will), then you can delete the ref with

git update-ref -d refs/stash

As a reminder this is a potentially destructive command; in the specific case where you know you either have saved a ref to that data, or no longer want it, then it's fine.

---

So it's not clear to me what would cause log to report a commit that doesn't seem to be reachable (based on the graph and on the lack of refnames on that particular commit). If I had a repo in that state I think I could figure out what's going on, but I really don't know how to reproduce the symptom.

My best suggestion is to do

git for-each-ref |grep 3fb311d

to see if for some reason a ref just isn't being named in the log. IF that shows nothing, another idea is just

git for-each-ref

Or see if

git fsck

tells you anything useful. If any of this turns up more information, I'll be happy to look at it and update with more suggestions.