Merge branch 'jc/merge' into next

diff --git a/refs.c b/refs.c
index 982ebf8ae53f0d64d419e820eb541624c0dec449..03398ccc531c15e549b66c43a176fd7b2bde4aca 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -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);