Merge branch 'jc/better-conflict-resolution'

[git.git] / rerere.c

diff --git a/rerere.c b/rerere.c
index 4e2c9dd5b7276acd11ddb6ffa6619962ef9f57f3..8447caeebc3c030398cd00d25f1fb61bc952e150 100644 (file)
--- a/rerere.c
+++ b/rerere.c
@@ -328,7 +328,6 @@ static int git_rerere_config(const char *var, const char *value, void *cb)
 
 static int is_rerere_enabled(void)
 {
-       struct stat st;
        const char *rr_cache;
        int rr_cache_exists;
 
@@ -336,7 +335,7 @@ static int is_rerere_enabled(void)
                return 0;
 
        rr_cache = git_path("rr-cache");
-       rr_cache_exists = !stat(rr_cache, &st) && S_ISDIR(st.st_mode);
+       rr_cache_exists = is_directory(rr_cache);
        if (rerere_enabled < 0)
                return rr_cache_exists;