Am 08.07.21 um 10:20 schrieb Ulrich Windl: >>>> René Scharfe <l.s.r@xxxxxx> schrieb am 06.07.2021 um 16:25 in Nachricht > <fcfd0401-df5b-15ec-29c4-74d2903274cd@xxxxxx>: >> Am 06.07.21 um 09:12 schrieb Ulrich Windl: >>>>>> René Scharfe <l.s.r@xxxxxx> schrieb am 05.07.2021 um 16:44 in Nachricht >>> <77655a4e-8c39-5ccc-71af-d2d8684bf208@xxxxxx>: >>>> Am 05.07.21 um 09:42 schrieb Ulrich Windl: >>>>>> You *can* overwrite them using "git branch --force foo" and then >>>>>> "git branch -d foo" works. >>>>> >>>>> Would it be OK to force the branch to any commit (e.g.: "master"), > relying >>> >>>> on >>>>> the fact that any reference (read: "master") to that commit will prevent >>>> actual >>>>> removal of the commit? >>>> >>>> Yes, any valid commit would do. This turns dangling branches into >>>> normal delete-able ones. Other branches are unaffected. >>> >>> OK, but either it does not work, or I did not understand what to do: >>> >>>> git branch --force bitmap-generic >>> fatal: Not a valid object name: 'bitmap-generic'. >>>> git fsck >>> Checking object directories: 100% (256/256), done. >>> Checking objects: 100% (173/173), done. >>> notice: HEAD points to an unborn branch (bitmap-generic) >>> dangling blob 0458be7cf03f35be365c819afe0104ff3c178ca0 >>> dangling blob 3000d29f0a652f3f7ed25572cac9969b90adeca5 >>> dangling commit 90e8531086d3efaeefdf6c8d39b6782e49dd2a0d >>> dangling commit b598195f859106662bde746f391a7df9162231e9 >>> dangling tree fb4866ab5cc2f0c34a63334b90550ef7199a2098 >>> ... >> >> First: Please make backups. >> >> Here's what works for me. First reproducing the error: >> >> $ echo aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa >.git/refs/heads/broken > > Hi! > > Thanks for the hints. But first the problem is in the repository, not in the > workspace, so I don't have a ".git/refs/", but "refs/". So you have a bare repository (one without worktree, i.e. no checked out files)? > The other thing is that the only "refs" that is there is "master"; the one > with the problem isn't there. You probably had your refs packed (in a file named "packed-refs"). > So I tried: > % echo aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa >refs/heads/bitmap-generic I used that command to generate a broken branch. You already had a broken branch, so you didn't need to repeat that reproduction step. > Then "git branch" indicated that "bitmap-generic" would be the current > branch: > % cat HEAD > ref: refs/heads/bitmap-generic HEAD references the current branch. So the broken branch was the current one for you? I somehow assumed that you'd be on a healthy branch. And I'm not fully sure how to use branches in a bare repository. > Next I brute-force edited HEAD, repacing bitmap-generic with master. OK, but at least this moved you to a healthy branch. > Still, that would not work: > % git branch --delete --force bitmap-generic > error: Couldn't look up commit object for 'refs/heads/bitmap-generic' Expected; you hadn't done anything to that branch, yet. > But the next command worked: > % git branch --force bitmap-generic This made the broken branch point to the same commit as the current branch, i.e. master. > Finally, this also worked: > % git branch --delete bitmap-generic > Deleted branch bitmap-generic (was 03aa7ca). Right; the previous command had unbroken the branch, so it had become deletable. > Most importantly "git fsck" did no longer complain. > > Thanks for the help! Do you want to provide an answer to stackexchange, or may > I use your procedure to write an answer? Feel free to use it. I don't even have an account there. René
