git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH] t2080: fix cp invocation to copy symlinks instead of following them

From
Matheus Tavares <matheus.bernardino@usp.br>
Date
May 26, 2021, 23:58 UTC
Message-ID
<5386ee606567248464d39c313ee6177862a1f337.1622071475.git.matheus.bernardino@usp.br>

t2080 makes a few copies of a test repository and later performs a branch switch on each one of the copies to verify that parallel checkout and sequential checkout produce the same results. However, the repository is copied with `cp -R` which, on some systems, defaults to following symlinks on the directory hierarchy and copying their target files instead of copying the symlinks themselves. AIX is one example of system where this happens. Because the symlinks are not preserved, the copied repositories have paths that do not match what is in the index, causing git to abort the checkout operation that we want to test. This makes the test fail on these systems.

Fix this by copying the repository with the POSIX flag '-P', which forces cp to copy the symlinks instead of following them. Note that we already use this flag for other cp invocations in our test suite (see t7001). With this change, t2080 now passes on AIX.

Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
---
 t/t2080-parallel-checkout-basics.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t2080-parallel-checkout-basics.sh b/t/t2080-parallel-checkout-basics.sh
index 7087818550..3e0f8c675f 100755
--- a/t/t2080-parallel-checkout-basics.sh
+++ b/t/t2080-parallel-checkout-basics.sh
@@ -114,7 +114,7 @@ do
 
 	test_expect_success "$mode checkout" '
 		repo=various_$mode &&
-		cp -R various $repo &&
+		cp -R -P various $repo &&
 
 		# The just copied files have more recent timestamps than their
 		# associated index entries. So refresh the cached timestamps
-- 
2.31.1
Next: Christian Couder
Message 1 of 15 in “t2080: fix cp invocation to copy symlinks instead of following them”
  1. t2080: fix cp invocation to copy symlinks instead of following themMatheus Tavares, May 26, 2021
  2. Christian CouderMay 27, 2021
  3. Ævar Arnfjörð BjarmasonMay 27, 2021
  4. Ævar Arnfjörð BjarmasonMay 31, 2021
  5. Matheus TavaresMay 31, 2021
  6. Ævar Arnfjörð BjarmasonMay 31, 2021
  7. Đoàn Trần Công DanhJun 2, 2021
  8. Ævar Arnfjörð BjarmasonJun 2, 2021
  9. Bagas SanjayaJun 2, 2021
  10. Đoàn Trần Công DanhJun 2, 2021
  11. Ævar Arnfjörð BjarmasonJun 2, 2021
  12. Đoàn Trần Công DanhJun 2, 2021
  13. Đoàn Trần Công DanhJun 3, 2021
  14. Torsten BögershausenJun 2, 2021
  15. brian m. carlsonJun 3, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.