summaryrefslogtreecommitdiff
path: root/kwset.h
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2015-05-14 15:20:52 -0400
committerJunio C Hamano <gitster@pobox.com>2015-05-14 12:33:15 -0700
commit0544574cdcd5b368e757fa7bb561c616f81febb9 (patch)
tree3543a6a98cc112e36fb42f35ad1ffb4f3a089975 /kwset.h
parent282616c72d1d08a77ca4fe1186cb708c38408d87 (diff)
downloadgit-0544574cdcd5b368e757fa7bb561c616f81febb9.tar.gz
rerere: exit silently on "forget" when rerere is disabledjk/rerere-forget-check-enabled
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>
Diffstat (limited to 'kwset.h')
0 files changed, 0 insertions, 0 deletions