]> git.ipfire.org Git - thirdparty/git.git/commit - rerere.c
rerere: exit silently on "forget" when rerere is disabled
authorJeff King <peff@peff.net>
Thu, 14 May 2015 19:20:52 +0000 (15:20 -0400)
committerJunio C Hamano <gitster@pobox.com>
Thu, 14 May 2015 19:33:15 +0000 (12:33 -0700)
commit0544574cdcd5b368e757fa7bb561c616f81febb9
tree3543a6a98cc112e36fb42f35ad1ffb4f3a089975
parent282616c72d1d08a77ca4fe1186cb708c38408d87
rerere: exit silently on "forget" when rerere is disabled

If you run "git rerere forget foo" in a repository that does
not have rerere enabled, git hits an internal error:

  $ git init -q
  $ git rerere forget foo
  fatal: BUG: attempt to commit unlocked object

The problem is that setup_rerere() will not actually take
the lock if the rerere system is disabled. We should notice
this and return early. We can return with a success code
here, because we know there is nothing to forget.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
rerere.c