Re: Recovering from gc errors

2017-11-14 Thread Jeff King
On Tue, Nov 14, 2017 at 10:39:31AM -0500, Marc Branchaud wrote: > >rm -rf .git/logs > > Unfortunately, removing the logs directory does not fix "git gc". So I > restored it. > > However I did find all of the bad SHAs in the HEAD logs of four of my > worktrees. Ah, right. There are more log

Re: Recovering from gc errors

2017-11-14 Thread Eric Sunshine
On Tue, Nov 14, 2017 at 10:39 AM, Marc Branchaud wrote: > I'm willing to chalk this up to bugs in the early worktree code, unless one > of the CC'd worktree developers thinks otherwise. > > An explicit "git worktree delete" command would be nice for manually > cleaning things up. It's easy to jus

Re: Recovering from gc errors

2017-11-14 Thread Marc Branchaud
(It turned out that this problem is related to worktrees. CCing some worktree folks.) On 2017-11-14 12:53 AM, Jeff King wrote: On Mon, Nov 13, 2017 at 04:13:19PM -0500, Marc Branchaud wrote: Various incantations of "git show ... 9c355a7726e31" only fail with the same error, so I can't determ

Re: Recovering from gc errors

2017-11-13 Thread Jeff King
On Mon, Nov 13, 2017 at 04:13:19PM -0500, Marc Branchaud wrote: > Various incantations of "git show ... 9c355a7726e31" only fail with the same > error, so I can't determine much about the problematic commit. Luckily I'm > not particularly concerned with losing objects, as I push any important > pr

Recovering from gc errors

2017-11-13 Thread Marc Branchaud
(I'm using git 2.15.0.) So today "git gc" started complaining: error: Could not read 2bc277bcb7e9cc6ef2ea677dd1c3dcd1f9af0c2b fatal: Failed to traverse parents of commit 9c355a7726e31b3033b8e714cf7edb4f0a41d8d4 error: failed to run repack I suspect I'm a victim of the worktree+submodule bugs