kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Jeff King 2015-05-14 15:20:52 -04:00 committed by Junio C Hamano
parent 282616c72d
commit 0544574cdc
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rerere.c
View File

@ -667,6 +667,8 @@ int rerere_forget(struct pathspec *pathspec)
return error("Could not read index"); return error("Could not read index");


fd = setup_rerere(&merge_rr, RERERE_NOAUTOUPDATE); fd = setup_rerere(&merge_rr, RERERE_NOAUTOUPDATE);
if (fd < 0)
return 0;


unmerge_cache(pathspec); unmerge_cache(pathspec);
find_conflict(&conflict); find_conflict(&conflict);