X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=refs.c;h=03398ccc531c15e549b66c43a176fd7b2bde4aca;hb=9acf322d69f54ff5bf9de8b2d6f9cd1dccf523a3;hp=7a2c56e64b8cea71a83217ba39e718234b96b876;hpb=68283999f8ae0e9286f8b7f199905b77d608cb80;p=git.git

diff --git a/refs.c b/refs.c
index 7a2c56e6..03398ccc 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) {
+				error("%s points nowhere!", path);
 				continue;
-			if (!has_sha1_file(sha1))
+			}
+			if (!has_sha1_file(sha1)) {
+				error("%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;
 	}
@@ -347,14 +348,6 @@ int check_ref_format(const char *ref)
 		if (!ch) {
 			if (level < 2)
 				return -1; /* at least of form "heads/blah" */
-
-			/* Do not allow ref name to end in "HEAD"
-			 * Note that cp is poiting at one past NUL at the end.
-			 * i.e. cp[-1] = NUL.
-			 */
-			if (5 <= cp - ref && !strcmp(cp - 5, "HEAD"))
-				return -1;
-
 			return 0;
 		}
 	}