diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-06-05 12:00:25 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-06-05 12:00:25 -0700 |
commit | 5c2e65497be246c6b61e772e79f54b346baf5f49 (patch) | |
tree | 4794aea09bee2e7a19aa2bfae240498db985e70e | |
parent | 4cb9fe35c015c576177d6a0ce096c935876544fc (diff) | |
parent | 0544574cdcd5b368e757fa7bb561c616f81febb9 (diff) | |
download | git-5c2e65497be246c6b61e772e79f54b346baf5f49.tar.gz |
Merge branch 'jk/rerere-forget-check-enabled' into maint
"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
-rw-r--r-- | rerere.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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); |