mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-10 15:46:11 +02:00
Code

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
This commit is contained in:
Junio C Hamano 2015-05-26 13:24:42 -07:00
parent 9532ead987 0544574cdc
commit c37d7b50f3
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

@ -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);