From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Alex Coppens <alex@nativetouch.com>, git@vger.kernel.org
Subject: Re: Problem with rerere forget
Date: Thu, 14 May 2015 15:16:38 -0400 [thread overview]
Message-ID: <20150514191637.GA9329@peff.net> (raw)
In-Reply-To: <xmqq7fsbkn9z.fsf@gitster.dls.corp.google.com>
On Thu, May 14, 2015 at 11:49:12AM -0700, Junio C Hamano wrote:
> Alex Coppens <alex@nativetouch.com> writes:
>
> > git rerere forget path_to_file/file.js
> >
> > fatal: BUG: attempt to commit unlocked object
>
> That comes from commit_lock_file(); I think rerere.c:write_rr()
> has a call to that function and I suspect that is the call that is
> giving the above message.
>
> Is there any other process that is mucking with your .git/index file
> while you are running the command?
This seems much easier to reproduce:
$ git init -q
$ git rerere forget foo
fatal: BUG: attempt to commit unlocked object
It looks like we need to pay more attention to the return value of
setup_rerere, which is what is supposed to take the lock.
-Peff
next prev parent reply other threads:[~2015-05-14 19:16 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-14 18:05 Problem with rerere forget Alex Coppens
2015-05-14 18:21 ` Stefan Beller
2015-05-14 18:40 ` Alex Coppens
2015-05-14 18:57 ` Stefan Beller
2015-05-14 18:49 ` Junio C Hamano
2015-05-14 19:16 ` Jeff King [this message]
2015-05-14 19:19 ` Junio C Hamano
2015-05-14 19:20 ` [PATCH] rerere: exit silently on "forget" when rerere is disabled Jeff King
2015-05-14 19:33 ` Junio C Hamano
2015-05-14 20:22 ` Jeff King
2015-05-14 20:51 ` Alex Coppens
2015-05-14 20:56 ` Jeff King
2015-05-14 20:59 ` Alex Coppens
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150514191637.GA9329@peff.net \
--to=peff@peff.net \
--cc=alex@nativetouch.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox