From: "Carlo Marcelo Arenas Belón" <carenas@gmail.com>
To: git@vger.kernel.org
Cc: hanwen@google.com,
"Carlo Marcelo Arenas Belón" <carenas@gmail.com>,
"Jeff King" <peff@peff.net>,
"Eric Sunshine" <sunshine@sunshineco.com>
Subject: [PATCH v2] t3200: refactor symlink test from hn/refs-errno-cleanup
Date: Thu, 19 Aug 2021 00:52:44 -0700 [thread overview]
Message-ID: <20210819075244.36776-1-carenas@gmail.com> (raw)
In-Reply-To: <20210819050103.25995-1-carenas@gmail.com>
d1931bcf0d (refs: make errno output explicit for refs_resolve_ref_unsafe,
2021-07-20) add a test for a crash when refs is a symlink, but it fails
on windows.
add the missing SYMLINKS dependency and while at it, refactor it slightly
to comply better with the CodingGuidelines.
Reported-by: Jeff King <peff@peff.net>
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
---
v2:
* update subject for clarity; might be worth squashing instead into 3d63ce75e
(refs: explicitly return failure_errno from parse_loose_ref_contents,
2021-07-20)
* change from --git-dir to -C for clarity
* add reporting for errors to the for loop as suggested by Eric
t/t3200-branch.sh | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index dd17718160..eacb6bcd35 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -109,17 +109,22 @@ test_expect_success 'git branch -m n/n n should work' '
git reflog exists refs/heads/n
'
-test_expect_success 'git branch -m with symlinked .git/refs' '
+test_expect_success SYMLINKS 'git branch -m with symlinked .git/refs' '
git init subdir &&
test_when_finished "rm -rf subdir" &&
- (cd subdir &&
- for d in refs objects packed-refs ; do
- rm -rf .git/$d &&
- ln -s ../../.git/$d .git/$d ; done ) &&
- git --git-dir subdir/.git/ branch rename-src &&
- expect=$(git rev-parse rename-src) &&
- git --git-dir subdir/.git/ branch -m rename-src rename-dest &&
- test $(git rev-parse rename-dest) = "$expect" &&
+ (
+ cd subdir &&
+ for d in refs objects packed-refs
+ do
+ rm -rf .git/$d &&
+ ln -s ../../.git/$d .git/$d || exit 1
+ done
+ ) &&
+ git -C subdir branch rename-src &&
+ git rev-parse rename-src >expect &&
+ git -C subdir branch -m rename-src rename-dest &&
+ git rev-parse rename-dest >actual &&
+ test_cmp expect actual &&
git branch -D rename-dest
'
base-commit: d1931bcf0d5ef75cdaf836347f4aefce902a6a38
--
2.33.0.476.gf000ecbed9
next prev parent reply other threads:[~2021-08-19 7:53 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-17 12:31 [PATCH] fixup! propagate errno from failing read Han-Wen Nienhuys via GitGitGadget
2021-08-17 16:14 ` Jonathan Tan
2021-08-18 22:19 ` Jonathan Nieder
2021-08-17 22:38 ` Junio C Hamano
2021-08-18 9:00 ` Han-Wen Nienhuys
2021-08-18 18:30 ` Junio C Hamano
2021-08-19 0:11 ` Junio C Hamano
2021-08-19 9:01 ` Han-Wen Nienhuys
2021-08-19 3:55 ` Jeff King
2021-08-19 5:01 ` [PATCH] t3200: refactor symlink test Carlo Marcelo Arenas Belón
2021-08-19 5:51 ` Eric Sunshine
2021-08-19 7:52 ` Carlo Marcelo Arenas Belón [this message]
2021-08-19 20:26 ` [PATCH v2] t3200: refactor symlink test from hn/refs-errno-cleanup Junio C Hamano
2021-08-19 20:26 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210819075244.36776-1-carenas@gmail.com \
--to=carenas@gmail.com \
--cc=git@vger.kernel.org \
--cc=hanwen@google.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).