X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=rerere.c;h=22dfc843da1528ffd0466d496c50c56702e55a24;hb=90e8b9b23dff20946a0eacdf8abedce7e32c1d78;hp=22996bd08b532fb8016f24391dd0e63010706385;hpb=f4784b3eab2e12e7a8fda7431572753f3a970c63;p=~andy%2Fgit

diff --git a/rerere.c b/rerere.c
index 22996bd08..22dfc843d 100644
--- a/rerere.c
+++ b/rerere.c
@@ -438,7 +438,7 @@ static int merge(const char *name, const char *path)
 		ret = 1;
 		goto out;
 	}
-	ret = ll_merge(&result, path, &base, NULL, &cur, "", &other, "", 0);
+	ret = ll_merge(&result, path, &base, NULL, &cur, "", &other, "", NULL);
 	if (!ret) {
 		FILE *f;
 
@@ -590,8 +590,7 @@ static int is_rerere_enabled(void)
 	if (rerere_enabled < 0)
 		return rr_cache_exists;
 
-	if (!rr_cache_exists &&
-	    (mkdir(rr_cache, 0777) || adjust_shared_perm(rr_cache)))
+	if (!rr_cache_exists && mkdir_in_gitdir(rr_cache))
 		die("Could not create directory %s", rr_cache);
 	return 1;
 }