Re: Problem with rerere forget

From: Stefan Beller <sbeller@google.com>
Date: May 14, 2015, 18:21 UTC
Message-ID: <CAGZ79kZ8Cy1Pp9cf7vExntbfe-YW5KjYx6Fogr3O94wDfwuOXg@mail.gmail.com>
In-Reply-To: <CAPt1q6fMMz61aZEJB9b+K6+kHFwkm+bMYXoKBj78GNJU+dWioA@mail.gmail.com>

On Thu, May 14, 2015 at 11:05 AM, Alex Coppens <alex@nativetouch.com> wrote:

> Hello there,
>
> So I am trying to make git forget a conflict resolution:

Which version of git do you run?

Show 11 quoted lines

> _______________
>
>
> git rerere forget path_to_file/file.js
>
> fatal: BUG: attempt to commit unlocked object
>
> _______________
>
> Google doesn't seem to know the answer: No results found for "fatal:
> BUG: attempt to commit unlocked object".

see: https://github.com/git/git/blob/master/lockfile.c#L316 (The "fatal:" will be added by the call to die)

>
>
> I think I am using rerere forget the wrong way. Can someone help?

(I don't think you're doing it wrong.)

The "BUG:" errors are a hint that the internal implementation of git is broken, which should be fixed, thanks for reporting! We'd need to find out where/how git broke and fix that. If it's a hard fix, we'd need to have a better error message at least.

Can you provide an example repository which reproduces this failure? Or better yet, can you git bisect git itself to find out when the error was introduced?

Thanks, Stefan

Show 8 quoted lines

>
> Regards,
>
> Alex
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html