From: David Turner <dturner@twopensource.com>
To: git@vger.kernel.org, mhagger@alum.mit.edu
Subject: [PATCH 07/24] t1430: improve test coverage of deletion of badly-named refs
Date: Thu, 7 Apr 2016 15:02:54 -0400 [thread overview]
Message-ID: <1460055791-23313-8-git-send-email-dturner@twopensource.com> (raw)
In-Reply-To: <1460055791-23313-1-git-send-email-dturner@twopensource.com>
From: Michael Haggerty <mhagger@alum.mit.edu>
Check "branch -d broken...ref"
Check various combinations of
* Deleting using "update-ref -d"
* Deleting using "update-ref --no-deref -d"
* Deleting using "branch -d"
in the following combinations of symref -> ref:
* badname -> broken...ref
* badname -> broken...ref (dangling)
* broken...symref -> master
* broken...symref -> idonotexist (dangling)
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
t/t1430-bad-ref-name.sh | 104 ++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 96 insertions(+), 8 deletions(-)
diff --git a/t/t1430-bad-ref-name.sh b/t/t1430-bad-ref-name.sh
index 612cc32..25ddab4 100755
--- a/t/t1430-bad-ref-name.sh
+++ b/t/t1430-bad-ref-name.sh
@@ -171,25 +171,113 @@ test_expect_success 'for-each-ref emits warnings for broken names' '
test_i18ngrep "ignoring ref with broken name refs/heads/broken\.\.\.symref" error
'
-test_expect_success 'update-ref --no-deref -d can delete reference to broken name' '
+test_expect_success 'update-ref -d can delete broken name' '
+ cp .git/refs/heads/master .git/refs/heads/broken...ref &&
+ test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+ git update-ref -d refs/heads/broken...ref >output 2>error &&
+ test_must_be_empty output &&
+ test_must_be_empty error &&
+ git branch >output 2>error &&
+ ! grep -e "broken\.\.\.ref" error &&
+ ! grep -e "broken\.\.\.ref" output
+'
+
+test_expect_success 'branch -d can delete broken name' '
+ cp .git/refs/heads/master .git/refs/heads/broken...ref &&
+ test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+ git branch -d broken...ref >output 2>error &&
+ test_i18ngrep "Deleted branch broken...ref (was broken)" output &&
+ test_must_be_empty error &&
+ git branch >output 2>error &&
+ ! grep -e "broken\.\.\.ref" error &&
+ ! grep -e "broken\.\.\.ref" output
+'
+
+test_expect_success 'update-ref --no-deref -d can delete symref to broken name' '
+ cp .git/refs/heads/master .git/refs/heads/broken...ref &&
+ test_when_finished "rm -f .git/refs/heads/broken...ref" &&
printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
test_when_finished "rm -f .git/refs/heads/badname" &&
- test_path_is_file .git/refs/heads/badname &&
git update-ref --no-deref -d refs/heads/badname >output 2>error &&
test_path_is_missing .git/refs/heads/badname &&
test_must_be_empty output &&
test_must_be_empty error
'
-test_expect_success 'update-ref -d can delete broken name' '
+test_expect_success 'branch -d can delete symref to broken name' '
cp .git/refs/heads/master .git/refs/heads/broken...ref &&
test_when_finished "rm -f .git/refs/heads/broken...ref" &&
- git update-ref -d refs/heads/broken...ref >output 2>error &&
+ printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
+ test_when_finished "rm -f .git/refs/heads/badname" &&
+ git branch -d badname >output 2>error &&
+ test_path_is_missing .git/refs/heads/badname &&
+ test_i18ngrep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output &&
+ test_must_be_empty error
+'
+
+test_expect_success 'update-ref --no-deref -d can delete dangling symref to broken name' '
+ printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
+ test_when_finished "rm -f .git/refs/heads/badname" &&
+ git update-ref --no-deref -d refs/heads/badname >output 2>error &&
+ test_path_is_missing .git/refs/heads/badname &&
test_must_be_empty output &&
- test_must_be_empty error &&
- git branch >output 2>error &&
- ! grep -e "broken\.\.\.ref" error &&
- ! grep -e "broken\.\.\.ref" output
+ test_must_be_empty error
+'
+
+test_expect_success 'branch -d can delete dangling symref to broken name' '
+ printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
+ test_when_finished "rm -f .git/refs/heads/badname" &&
+ git branch -d badname >output 2>error &&
+ test_path_is_missing .git/refs/heads/badname &&
+ test_i18ngrep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output &&
+ test_must_be_empty error
+'
+
+test_expect_success 'update-ref -d can delete broken name through symref' '
+ cp .git/refs/heads/master .git/refs/heads/broken...ref &&
+ test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+ printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
+ test_when_finished "rm -f .git/refs/heads/badname" &&
+ git update-ref -d refs/heads/badname >output 2>error &&
+ test_path_is_missing .git/refs/heads/broken...ref &&
+ test_must_be_empty output &&
+ test_must_be_empty error
+'
+
+test_expect_success 'update-ref --no-deref -d can delete symref with broken name' '
+ printf "ref: refs/heads/master\n" >.git/refs/heads/broken...symref &&
+ test_when_finished "rm -f .git/refs/heads/broken...symref" &&
+ git update-ref --no-deref -d refs/heads/broken...symref >output 2>error &&
+ test_path_is_missing .git/refs/heads/broken...symref &&
+ test_must_be_empty output &&
+ test_must_be_empty error
+'
+
+test_expect_success 'branch -d can delete symref with broken name' '
+ printf "ref: refs/heads/master\n" >.git/refs/heads/broken...symref &&
+ test_when_finished "rm -f .git/refs/heads/broken...symref" &&
+ git branch -d broken...symref >output 2>error &&
+ test_path_is_missing .git/refs/heads/broken...symref &&
+ test_i18ngrep "Deleted branch broken...symref (was refs/heads/master)" output &&
+ test_must_be_empty error
+'
+
+test_expect_success 'update-ref --no-deref -d can delete dangling symref with broken name' '
+ printf "ref: refs/heads/idonotexist\n" >.git/refs/heads/broken...symref &&
+ test_when_finished "rm -f .git/refs/heads/broken...symref" &&
+ git update-ref --no-deref -d refs/heads/broken...symref >output 2>error &&
+ test_path_is_missing .git/refs/heads/broken...symref &&
+ test_must_be_empty output &&
+ test_must_be_empty error
+'
+
+test_expect_success 'branch -d can delete dangling symref with broken name' '
+ printf "ref: refs/heads/idonotexist\n" >.git/refs/heads/broken...symref &&
+ test_when_finished "rm -f .git/refs/heads/broken...symref" &&
+ git branch -d broken...symref >output 2>error &&
+ test_path_is_missing .git/refs/heads/broken...symref &&
+ test_i18ngrep "Deleted branch broken...symref (was refs/heads/idonotexist)" output &&
+ test_must_be_empty error
'
test_expect_success 'update-ref -d cannot delete non-ref in .git dir' '
--
2.4.2.767.g62658d5-twtrsrc
next prev parent reply other threads:[~2016-04-07 19:03 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-07 19:02 [PATCH 00/24] Yet another pre-refs-backend series David Turner
2016-04-07 19:02 ` [PATCH 01/24] refs: move head_ref{,_submodule} to the common code David Turner
2016-04-07 19:02 ` [PATCH 02/24] refs: move for_each_*ref* functions into " David Turner
2016-04-07 19:02 ` [PATCH 03/24] t1430: test the output and error of some commands more carefully David Turner
2016-04-08 15:14 ` Michael Haggerty
2016-04-08 19:26 ` David Turner
2016-04-08 20:43 ` Junio C Hamano
2016-04-08 21:57 ` David Turner
2016-04-07 19:02 ` [PATCH 04/24] t1430: clean up broken refs/tags/shadow David Turner
2016-04-07 19:02 ` [PATCH 05/24] t1430: don't rely on symbolic-ref for creating broken symrefs David Turner
2016-04-07 19:02 ` [PATCH 06/24] t1430: test for-each-ref in the presence of badly-named refs David Turner
2016-04-07 19:02 ` David Turner [this message]
2016-04-07 19:02 ` [PATCH 08/24] resolve_missing_loose_ref(): simplify semantics David Turner
2016-04-07 19:02 ` [PATCH 09/24] resolve_ref_unsafe(): use for loop to count up to MAXDEPTH David Turner
2016-04-07 19:02 ` [PATCH 10/24] resolve_ref_unsafe(): ensure flags is always set David Turner
2016-04-07 19:02 ` [PATCH 11/24] resolve_ref_1(): eliminate local variable David Turner
2016-04-07 19:02 ` [PATCH 12/24] resolve_ref_1(): reorder code David Turner
2016-04-07 19:03 ` [PATCH 13/24] resolve_ref_1(): eliminate local variable "bad_name" David Turner
2016-04-07 19:03 ` [PATCH 14/24] files-backend: break out ref reading David Turner
2016-04-07 19:03 ` [PATCH 15/24] read_raw_ref(): manage own scratch space David Turner
2016-04-07 19:03 ` [PATCH 16/24] Inline resolve_ref_1() into resolve_ref_unsafe() David Turner
2016-04-07 19:03 ` [PATCH 17/24] read_raw_ref(): change flags parameter to unsigned int David Turner
2016-04-07 19:03 ` [PATCH 18/24] fsck_head_link(): remove unneeded flag variable David Turner
2016-04-07 19:03 ` [PATCH 19/24] cmd_merge(): " David Turner
2016-04-07 19:03 ` [PATCH 20/24] checkout_paths(): " David Turner
2016-04-07 19:03 ` [PATCH 21/24] check_aliased_update(): check that dst_name is non-NULL David Turner
2016-04-07 19:03 ` [PATCH 22/24] show_head_ref(): check the result of resolve_ref_namespace() David Turner
2016-04-07 19:03 ` [PATCH 23/24] refs: move resolve_ref_unsafe into common code David Turner
2016-04-07 19:03 ` [PATCH 24/24] refs: on symref reflog expire, lock symref not referrent David Turner
2016-04-07 22:29 ` [PATCH 00/24] Yet another pre-refs-backend series Junio C Hamano
2016-04-09 16:19 ` Michael Haggerty
2016-04-10 2:10 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1460055791-23313-8-git-send-email-dturner@twopensource.com \
--to=dturner@twopensource.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).