diff options
| author | Matheus Tavares <matheus.bernardino@usp.br> | 2021-05-26 20:58:56 -0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-27 09:04:49 +0900 |
| commit | ea08db7473318798527361d4b85a67d9a1325eb4 (patch) | |
| tree | 6a84fcedc9575457ba01fb9323ddac78fa74c0f7 /t/t2080-parallel-checkout-basics.sh | |
| parent | d0e5d357000f44af5ac80f4bab5809d0d8b196d3 (diff) | |
| download | git-ea08db7473318798527361d4b85a67d9a1325eb4.tar.gz | |
t2080: fix cp invocation to copy symlinks instead of following them
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t2080-parallel-checkout-basics.sh')
| -rwxr-xr-x | t/t2080-parallel-checkout-basics.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |