From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 26 May 2015 20:24:42 +0000 (-0700)
Subject: Merge branch 'jk/rerere-forget-check-enabled'
X-Git-Tag: v2.5.0-rc0~78
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c37d7b50f345e8f52e3e902384cd87d96decc155?hp=9532ead9875b7b92ff2007f9de61af5874e8839a

Merge branch 'jk/rerere-forget-check-enabled'

"git rerere forget" in a repository without rerere enabled gave a
cryptic error message; it should be a silent no-op instead.

* jk/rerere-forget-check-enabled:
rerere: exit silently on "forget" when rerere is disabled
---

diff --git a/rerere.c b/rerere.c
index 31644dec04..94aea9a36f 100644
--- a/rerere.c
+++ b/rerere.c
@@ -659,6 +659,8 @@ int rerere_forget(struct pathspec *pathspec)
 		return error("Could not read index");
 
 	fd = setup_rerere(&merge_rr, RERERE_NOAUTOUPDATE);
+	if (fd < 0)
+		return 0;
 
 	unmerge_cache(pathspec);
 	find_conflict(&conflict);