Merge branch 'jk/xdiff-drop-xdl-fast-hash'

diff --git a/builtin/symbolic-ref.c b/builtin/symbolic-ref.c
index ce0fde705c0350ad99678541f434df5e07f5a263..96eed944683a45c33fa5d4a05414ae56406fafca 100644 (file)
--- a/builtin/symbolic-ref.c
+++ b/builtin/symbolic-ref.c
@@ -56,6 +56,8 @@ int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)
                ret = check_symref(argv[0], 1, 0, 0);
                if (ret)
                        die("Cannot delete %s, not a symbolic ref", argv[0]);
+               if (!strcmp(argv[0], "HEAD"))
+                       die("deleting '%s' is not allowed", argv[0]);
                return delete_ref(argv[0], NULL, REF_NODEREF);
        }
 
@@ -67,7 +69,7 @@ int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)
                if (!strcmp(argv[0], "HEAD") &&
                    !starts_with(argv[1], "refs/"))
                        die("Refusing to point HEAD outside of refs/");
-               create_symref(argv[0], argv[1], msg);
+               ret = !!create_symref(argv[0], argv[1], msg);
                break;
        default:
                usage_with_options(git_symbolic_ref_usage, options);