Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
enter_repo: allow .git files in strict mode
[gitweb.git]
/
builtin
/
am.c
diff --git
a/builtin/am.c
b/builtin/am.c
index 27165a6730ef04da2b4c22ee03eccadfa2e517b6..83b3d86e67f1ef335d0d3011ef0205909b315692 100644
(file)
--- a/
builtin/am.c
+++ b/
builtin/am.c
@@
-2057,11
+2057,6
@@
static int clean_index(const unsigned char *head, const unsigned char *remote)
static void am_rerere_clear(void)
{
struct string_list merge_rr = STRING_LIST_INIT_DUP;
- int fd = setup_rerere(&merge_rr, 0);
-
- if (fd < 0)
- return;
-
rerere_clear(&merge_rr);
string_list_clear(&merge_rr, 1);
}