From: "Han-Wen Nienhuys via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Han-Wen Nienhuys <hanwenn@gmail.com>,
Han-Wen Nienhuys <hanwen@google.com>
Subject: [PATCH v2 04/11] t3320: use git-symbolic-ref rather than filesystem access
Date: Thu, 22 Jul 2021 21:28:40 +0000 [thread overview]
Message-ID: <7b98d092811c3b479b41e5ef3327d795d794fde2.1626989327.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1052.v2.git.git.1626989327.gitgitgadget@gmail.com>
From: Han-Wen Nienhuys <hanwen@google.com>
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
---
t/t3320-notes-merge-worktrees.sh | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/t/t3320-notes-merge-worktrees.sh b/t/t3320-notes-merge-worktrees.sh
index 052516e6c6a..6b2d507f3e7 100755
--- a/t/t3320-notes-merge-worktrees.sh
+++ b/t/t3320-notes-merge-worktrees.sh
@@ -46,8 +46,9 @@ test_expect_success 'create some new worktrees' '
test_expect_success 'merge z into y fails and sets NOTES_MERGE_REF' '
git config core.notesRef refs/notes/y &&
test_must_fail git notes merge z &&
- echo "ref: refs/notes/y" >expect &&
- test_cmp expect .git/NOTES_MERGE_REF
+ echo "refs/notes/y" >expect &&
+ git symbolic-ref NOTES_MERGE_REF >actual &&
+ test_cmp expect actual
'
test_expect_success 'merge z into y while mid-merge in another workdir fails' '
@@ -57,7 +58,7 @@ test_expect_success 'merge z into y while mid-merge in another workdir fails' '
test_must_fail git notes merge z 2>err &&
test_i18ngrep "a notes merge into refs/notes/y is already in-progress at" err
) &&
- test_path_is_missing .git/worktrees/worktree/NOTES_MERGE_REF
+ test_must_fail git -C worktree symbolic-ref NOTES_MERGE_REF
'
test_expect_success 'merge z into x while mid-merge on y succeeds' '
@@ -68,8 +69,9 @@ test_expect_success 'merge z into x while mid-merge on y succeeds' '
test_i18ngrep "Automatic notes merge failed" out &&
grep -v "A notes merge into refs/notes/x is already in-progress in" out
) &&
- echo "ref: refs/notes/x" >expect &&
- test_cmp expect .git/worktrees/worktree2/NOTES_MERGE_REF
+ echo "refs/notes/x" >expect &&
+ git -C worktree2 symbolic-ref NOTES_MERGE_REF >actual &&
+ test_cmp expect actual
'
test_done
--
gitgitgadget
next prev parent reply other threads:[~2021-07-22 21:29 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-19 18:07 [PATCH 0/6] Fix direct filesystem access in various test files Han-Wen Nienhuys via GitGitGadget
2021-07-19 18:07 ` [PATCH 1/6] t6050: use git-update-ref rather than filesystem access Han-Wen Nienhuys via GitGitGadget
2021-07-19 18:07 ` [PATCH 2/6] t1503: mark symlink test as REFFILES Han-Wen Nienhuys via GitGitGadget
2021-07-19 18:07 ` [PATCH 3/6] t6120: use git-update-ref rather than filesystem access Han-Wen Nienhuys via GitGitGadget
2021-07-19 18:07 ` [PATCH 4/6] t7509: " Han-Wen Nienhuys via GitGitGadget
2021-07-19 21:35 ` Junio C Hamano
2021-07-19 18:07 ` [PATCH 5/6] t3320: use git-symbolic-ref " Han-Wen Nienhuys via GitGitGadget
2021-07-19 18:07 ` [PATCH 6/6] t2402: use ref-store test helper to create broken symlink Han-Wen Nienhuys via GitGitGadget
2021-07-22 21:28 ` [PATCH v2 00/11] Fix direct filesystem access in various test files Han-Wen Nienhuys via GitGitGadget
2021-07-22 21:28 ` [PATCH v2 01/11] t6050: use git-update-ref rather than filesystem access Han-Wen Nienhuys via GitGitGadget
2021-07-22 21:28 ` [PATCH v2 02/11] t1503: mark symlink test as REFFILES Han-Wen Nienhuys via GitGitGadget
2021-07-22 21:28 ` [PATCH v2 03/11] t6120: use git-update-ref rather than filesystem access Han-Wen Nienhuys via GitGitGadget
2021-07-22 21:28 ` Han-Wen Nienhuys via GitGitGadget [this message]
2021-07-22 21:28 ` [PATCH v2 05/11] t2402: use ref-store test helper to create broken symlink Han-Wen Nienhuys via GitGitGadget
2021-07-22 21:28 ` [PATCH v2 06/11] t1405: use 'git reflog exists' to check reflog existence Han-Wen Nienhuys via GitGitGadget
2021-07-23 17:15 ` Junio C Hamano
2021-07-22 21:28 ` [PATCH v2 07/11] t1405: mark test for 'git pack-refs' as REFFILES Han-Wen Nienhuys via GitGitGadget
2021-07-23 17:28 ` Junio C Hamano
2021-07-22 21:28 ` [PATCH v2 08/11] t1410: mark test " Han-Wen Nienhuys via GitGitGadget
2021-07-23 17:32 ` Junio C Hamano
2021-07-22 21:28 ` [PATCH v2 09/11] t7064: use update-ref -d to remove upstream branch Han-Wen Nienhuys via GitGitGadget
2021-07-23 17:37 ` Junio C Hamano
2021-07-22 21:28 ` [PATCH v2 10/11] t6500: use "ls -1" to snapshot ref database state Han-Wen Nienhuys via GitGitGadget
2021-07-22 21:28 ` [PATCH v2 11/11] t6001: avoid direct file system access Han-Wen Nienhuys via GitGitGadget
2021-07-23 17:40 ` Junio C Hamano
2021-07-23 17:44 ` [PATCH v2 00/11] Fix direct filesystem access in various test files Junio C Hamano
2021-08-02 13:38 ` Han-Wen Nienhuys
2021-08-02 16:27 ` Junio C Hamano
2021-08-02 16:28 ` Junio C Hamano
2021-08-02 16:53 ` Han-Wen Nienhuys
2021-08-02 16:53 ` [PATCH v3 " Han-Wen Nienhuys via GitGitGadget
2021-08-02 16:53 ` [PATCH v3 01/11] t6050: use git-update-ref rather than filesystem access Han-Wen Nienhuys via GitGitGadget
2021-08-02 16:53 ` [PATCH v3 02/11] t1503: mark symlink test as REFFILES Han-Wen Nienhuys via GitGitGadget
2021-08-02 16:53 ` [PATCH v3 03/11] t6120: use git-update-ref rather than filesystem access Han-Wen Nienhuys via GitGitGadget
2021-08-02 16:53 ` [PATCH v3 04/11] t3320: use git-symbolic-ref " Han-Wen Nienhuys via GitGitGadget
2021-08-02 16:53 ` [PATCH v3 05/11] t2402: use ref-store test helper to create broken symlink Han-Wen Nienhuys via GitGitGadget
2021-08-02 16:53 ` [PATCH v3 06/11] t1405: use 'git reflog exists' to check reflog existence Han-Wen Nienhuys via GitGitGadget
2021-08-02 16:53 ` [PATCH v3 07/11] t1405: mark test for 'git pack-refs' as REFFILES Han-Wen Nienhuys via GitGitGadget
2021-08-02 16:53 ` [PATCH v3 08/11] t1410: mark test " Han-Wen Nienhuys via GitGitGadget
2021-08-02 16:53 ` [PATCH v3 09/11] t7064: use update-ref -d to remove upstream branch Han-Wen Nienhuys via GitGitGadget
2021-08-02 16:53 ` [PATCH v3 10/11] t6500: use "ls -1" to snapshot ref database state Han-Wen Nienhuys via GitGitGadget
2021-08-02 16:53 ` [PATCH v3 11/11] t6001: avoid direct file system access Han-Wen Nienhuys via GitGitGadget
2021-08-02 20:07 ` [PATCH v3 00/11] Fix direct filesystem access in various test files Junio C Hamano
2021-08-02 21:32 ` Junio C Hamano
2021-08-03 9:37 ` Han-Wen Nienhuys
2021-07-22 22:24 ` [PATCH 0/6] " 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=7b98d092811c3b479b41e5ef3327d795d794fde2.1626989327.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=hanwen@google.com \
--cc=hanwenn@gmail.com \
/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).