X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-symbolic-ref.c;h=6ae6bcc0e8d02d9af8a81a7d694c0bfd2c6c0514;hb=7f5a68ad4d0e00eb2f28405946ec0f2691d7ad81;hp=d33982b967e7665ae79fb186435d9ed9aabb907b;hpb=f85fd3f0d1213a2b714fddc7a834817aceeca932;p=git.git

diff --git a/builtin-symbolic-ref.c b/builtin-symbolic-ref.c
index d33982b96..6ae6bcc0e 100644
--- a/builtin-symbolic-ref.c
+++ b/builtin-symbolic-ref.c
@@ -4,7 +4,7 @@
 #include "parse-options.h"
 
 static const char * const git_symbolic_ref_usage[] = {
-	"git-symbolic-ref [options] name [ref]",
+	"git symbolic-ref [options] name [ref]",
 	NULL
 };
 
@@ -35,7 +35,7 @@ int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)
 		OPT_END(),
 	};
 
-	git_config(git_default_config);
+	git_config(git_default_config, NULL);
 	argc = parse_options(argc, argv, options, git_symbolic_ref_usage, 0);
 	if (msg &&!*msg)
 		die("Refusing to perform update with empty message");
@@ -44,6 +44,9 @@ int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)
 		check_symref(argv[0], quiet);
 		break;
 	case 2:
+		if (!strcmp(argv[0], "HEAD") &&
+		    prefixcmp(argv[1], "refs/"))
+			die("Refusing to point HEAD outside of refs/");
 		create_symref(argv[0], argv[1], msg);
 		break;
 	default: