diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-09-19 13:51:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-19 13:51:41 -0700 |
| commit | d6645312ff82245a8e9bc8187ad16c57456bff38 (patch) | |
| tree | bcbef7c70559fa152cecd06a9242145ecb5c374f /t | |
| parent | 4c10c311376ef0cd279dace6a05e2101d60536e4 (diff) | |
| parent | 12cfa792b8657cfd37523df83df0a83d987570a5 (diff) | |
| download | git-d6645312ff82245a8e9bc8187ad16c57456bff38.tar.gz git-d6645312ff82245a8e9bc8187ad16c57456bff38.tar.xz | |
Merge branch 'jc/forbid-symbolic-ref-d-HEAD' into maint
"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
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1401-symbolic-ref.sh | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/t/t1401-symbolic-ref.sh b/t/t1401-symbolic-ref.sh index ca3fa406c..eec3e90f9 100755 --- a/t/t1401-symbolic-ref.sh +++ b/t/t1401-symbolic-ref.sh @@ -33,18 +33,25 @@ test_expect_success 'symbolic-ref refuses bare sha1' ' ' reset_to_sane -test_expect_success 'symbolic-ref deletes HEAD' ' - git symbolic-ref -d HEAD && +test_expect_success 'HEAD cannot be removed' ' + 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_missing .git/HEAD + test_path_is_missing .git/NOTHEAD ' reset_to_sane -test_expect_success 'symbolic-ref deletes dangling HEAD' ' - git symbolic-ref HEAD refs/heads/missing && - git symbolic-ref -d HEAD && +test_expect_success 'symbolic-ref can delete dangling symref' ' + git symbolic-ref NOTHEAD refs/heads/missing && + git symbolic-ref -d NOTHEAD && test_path_is_missing .git/refs/heads/missing && - test_path_is_missing .git/HEAD + test_path_is_missing .git/NOTHEAD ' reset_to_sane |