Merge branch 'lt/oneway'

diff --git a/refs.c b/refs.c
index 982ebf8ae53f0d64d419e820eb541624c0dec449..275b914b2b4cd17f26e85ab1ca5b32ea573acab4 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -76,8 +76,8 @@ int create_symref(const char *git_HEAD, const char *refs_heads_master)
        char ref[1000];
        int fd, len, written;
 
-#ifdef USE_SYMLINK_HEAD
-       if (!only_use_symrefs) {
+#ifndef NO_SYMLINK_HEAD
+       if (prefer_symlink_refs) {
                unlink(git_HEAD);
                if (!symlink(refs_heads_master, git_HEAD))
                        return 0;
@@ -152,12 +152,12 @@ static int do_for_each_ref(const char *base, int (*fn)(const char *path, const u
                                continue;
                        }
                        if (read_ref(git_path("%s", path), sha1) < 0) {
-                               fprintf(stderr, "%s points nowhere!", path);
+                               error("%s points nowhere!", path);
                                continue;
                        }
                        if (!has_sha1_file(sha1)) {
-                               fprintf(stderr, "%s does not point to a valid "
-                                               "commit object!", path);
+                               error("%s does not point to a valid "
+                                     "commit object!", path);
                                continue;
                        }
                        retval = fn(path, sha1);