git-revert with conflicts to behave as git-merge with conflicts

diff --git a/refs.c b/refs.c
index 858c53445c01fc0ed0db2affc99ddf9b9c319e19..3d100df85c4ca9f2f54c22a5c771014a8ba10f38 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -234,6 +234,12 @@ const char *resolve_ref(const char *ref, unsigned char *sha1, int reading, int *
                        }
                }
 
+               /* Is it a directory? */
+               if (S_ISDIR(st.st_mode)) {
+                       errno = EISDIR;
+                       return NULL;
+               }
+
                /*
                 * Anything else, just open it and try to use it as
                 * a ref
@@ -498,7 +504,7 @@ static int remove_empty_dir_recursive(char *path, int len)
                    strcpy(path + len, e->d_name) &&
                    !lstat(path, &st) &&
                    S_ISDIR(st.st_mode) &&
-                   remove_empty_dir_recursive(path, len + namlen))
+                   !remove_empty_dir_recursive(path, len + namlen))
                        continue; /* happy */
 
                /* path too long, stat fails, or non-directory still exists */
@@ -621,12 +627,13 @@ struct ref_lock *lock_any_ref_for_update(const char *ref, const unsigned char *o
        return lock_ref_sha1_basic(ref, old_sha1, NULL);
 }
 
+static struct lock_file packlock;
+
 static int repack_without_ref(const char *refname)
 {
        struct ref_list *list, *packed_ref_list;
        int fd;
        int found = 0;
-       struct lock_file packlock;
 
        packed_ref_list = get_packed_refs();
        for (list = packed_ref_list; list; list = list->next) {
@@ -714,7 +721,8 @@ static int log_ref_write(struct ref_lock *lock,
        char *logrec;
        const char *committer;
 
-       if (log_all_ref_updates) {
+       if (log_all_ref_updates &&
+           !strncmp(lock->ref_name, "refs/heads/", 11)) {
                if (safe_create_leading_directories(lock->log_file) < 0)
                        return error("unable to create directory for %s",
                                lock->log_file);
@@ -723,7 +731,7 @@ static int log_ref_write(struct ref_lock *lock,
 
        logfd = open(lock->log_file, oflags, 0666);
        if (logfd < 0) {
-               if (!log_all_ref_updates && errno == ENOENT)
+               if (!(oflags & O_CREAT) && errno == ENOENT)
                        return 0;
                return error("Unable to append to %s: %s",
                        lock->log_file, strerror(errno));