mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'jc/forbid-symbolic-ref-d-HEAD'
"git symbolic-ref -d HEAD" happily removes the symbolic ref, but the resulting repository becomes an invalid one. Teach the command to forbid removal of HEAD. * jc/forbid-symbolic-ref-d-HEAD: symbolic-ref -d: do not allow removal of HEAD
This commit is contained in:
commit
d1de693d0d
|
@ -56,6 +56,8 @@ int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)
|
||||||
ret = check_symref(argv[0], 1, 0, 0);
|
ret = check_symref(argv[0], 1, 0, 0);
|
||||||
if (ret)
|
if (ret)
|
||||||
die("Cannot delete %s, not a symbolic ref", argv[0]);
|
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);
|
return delete_ref(argv[0], NULL, REF_NODEREF);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -33,18 +33,25 @@ test_expect_success 'symbolic-ref refuses bare sha1' '
|
||||||
'
|
'
|
||||||
reset_to_sane
|
reset_to_sane
|
||||||
|
|
||||||
test_expect_success 'symbolic-ref deletes HEAD' '
|
test_expect_success 'HEAD cannot be removed' '
|
||||||
git symbolic-ref -d HEAD &&
|
test_must_fail git symbolic-ref -d HEAD
|
||||||
|
'
|
||||||
|
|
||||||
|
reset_to_sane
|
||||||
|
|
||||||
|
test_expect_success 'symbolic-ref can be deleted' '
|
||||||
|
git symbolic-ref NOTHEAD refs/heads/foo &&
|
||||||
|
git symbolic-ref -d NOTHEAD &&
|
||||||
test_path_is_file .git/refs/heads/foo &&
|
test_path_is_file .git/refs/heads/foo &&
|
||||||
test_path_is_missing .git/HEAD
|
test_path_is_missing .git/NOTHEAD
|
||||||
'
|
'
|
||||||
reset_to_sane
|
reset_to_sane
|
||||||
|
|
||||||
test_expect_success 'symbolic-ref deletes dangling HEAD' '
|
test_expect_success 'symbolic-ref can delete dangling symref' '
|
||||||
git symbolic-ref HEAD refs/heads/missing &&
|
git symbolic-ref NOTHEAD refs/heads/missing &&
|
||||||
git symbolic-ref -d HEAD &&
|
git symbolic-ref -d NOTHEAD &&
|
||||||
test_path_is_missing .git/refs/heads/missing &&
|
test_path_is_missing .git/refs/heads/missing &&
|
||||||
test_path_is_missing .git/HEAD
|
test_path_is_missing .git/NOTHEAD
|
||||||
'
|
'
|
||||||
reset_to_sane
|
reset_to_sane
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue