From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Jul 2010 19:08:36 +0000 (-0700)
Subject: Merge branch 'js/merge-rr-fix'
X-Git-Tag: v1.7.2~18
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4bd874c8f30d55b6189dacf1d769855ed2df4299?hp=-c

Merge branch 'js/merge-rr-fix'

* js/merge-rr-fix:
MERGE_RR is in .git, not .git/rr-cache
---

4bd874c8f30d55b6189dacf1d769855ed2df4299
diff --combined builtin/rerere.c
index 980d5421ee,1207cb1ea5..39ad60169d
--- a/builtin/rerere.c
+++ b/builtin/rerere.c
@@@ -59,7 -59,7 +59,7 @@@ static void garbage_collect(struct stri
  		cutoff = (has_rerere_resolution(e->d_name)
  			  ? cutoff_resolve : cutoff_noresolve);
  		if (then < now - cutoff * 86400)
 -			string_list_append(e->d_name, &to_remove);
 +			string_list_append(&to_remove, e->d_name);
  	}
  	for (i = 0; i < to_remove.nr; i++)
  		unlink_rr_item(to_remove.items[i].string);
@@@ -135,7 -135,7 +135,7 @@@ int cmd_rerere(int argc, const char **a
  			if (!has_rerere_resolution(name))
  				unlink_rr_item(name);
  		}
- 		unlink_or_warn(git_path("rr-cache/MERGE_RR"));
+ 		unlink_or_warn(git_path("MERGE_RR"));
  	} else if (!strcmp(argv[1], "gc"))
  		garbage_collect(&merge_rr);
  	else if (!strcmp(argv[1], "status"))