Merge branch 'pw/rebase-i-regression-fix'

diff --git a/builtin/symbolic-ref.c b/builtin/symbolic-ref.c
index 9c29a64e4331e1e45b4467829ba950006b673818..70addef158b347488366f6c5787d326c3657adcd 100644 (file)
--- a/builtin/symbolic-ref.c
+++ b/builtin/symbolic-ref.c
@@ -56,7 +56,9 @@ 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]);
-               return delete_ref(argv[0], NULL, REF_NODEREF);
+               if (!strcmp(argv[0], "HEAD"))
+                       die("deleting '%s' is not allowed", argv[0]);
+               return delete_ref(NULL, argv[0], NULL, REF_NODEREF);
        }
 
        switch (argc) {