X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=refs.c;h=982ebf8ae53f0d64d419e820eb541624c0dec449;hb=d5dddccaa0c61c67340efca36237dfa06eccef1c;hp=c33729c54a001423fb682cc920b72e5b1d03f8ea;hpb=f7087e2e7c34421b4577876969da94d0f6195414;p=git.git diff --git a/refs.c b/refs.c index c33729c5..982ebf8a 100644 --- a/refs.c +++ b/refs.c @@ -6,10 +6,6 @@ /* We allow "recursive" symbolic refs. Only within reason, though */ #define MAXDEPTH 5 -#ifndef USE_SYMLINK_HEAD -#define USE_SYMLINK_HEAD 1 -#endif - const char *resolve_ref(const char *path, unsigned char *sha1, int reading) { int depth = MAXDEPTH, len; @@ -80,7 +76,7 @@ int create_symref(const char *git_HEAD, const char *refs_heads_master) char ref[1000]; int fd, len, written; -#if USE_SYMLINK_HEAD +#ifdef USE_SYMLINK_HEAD if (!only_use_symrefs) { unlink(git_HEAD); if (!symlink(refs_heads_master, git_HEAD)) @@ -155,10 +151,15 @@ static int do_for_each_ref(const char *base, int (*fn)(const char *path, const u break; continue; } - if (read_ref(git_path("%s", path), sha1) < 0) + if (read_ref(git_path("%s", path), sha1) < 0) { + fprintf(stderr, "%s points nowhere!", path); continue; - if (!has_sha1_file(sha1)) + } + if (!has_sha1_file(sha1)) { + fprintf(stderr, "%s does not point to a valid " + "commit object!", path); continue; + } retval = fn(path, sha1); if (retval) break; @@ -272,7 +273,7 @@ static int write_ref_file(const char *filename, char term = '\n'; if (write(fd, hex, 40) < 40 || write(fd, &term, 1) < 1) { - error("Couldn't write %s\n", filename); + error("Couldn't write %s", filename); close(fd); return -1; }