diff options
| author | Johannes Sixt <j6t@kdbg.org> | 2013-06-07 20:53:32 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-07 22:01:51 (GMT) |
| commit | 622f98e272196c9eb00ae4bc7b8710ed72a2c1ad (patch) | |
| tree | b0cb1cd52a301b45736db0176de81c36d12d3d17 /t/t3509-cherry-pick-merge-df.sh | |
| parent | e40db07f5f4e46dc8678f81b672a0466d4d5b7ad (diff) | |
| download | git-622f98e272196c9eb00ae4bc7b8710ed72a2c1ad.zip git-622f98e272196c9eb00ae4bc7b8710ed72a2c1ad.tar.gz git-622f98e272196c9eb00ae4bc7b8710ed72a2c1ad.tar.bz2 | |
t3509, t4023, t4114: use test_ln_s_add to remove SYMLINKS prerequisite
In t4023 and t4114, we have to remove the entries using 'git rm' because
otherwise the entries that must turn from symbolic links to regular files
would stay symbolic links in the index. For the same reason, we have to
use 'git mv' instead of plain 'mv' in t3509.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3509-cherry-pick-merge-df.sh')
| -rwxr-xr-x | t/t3509-cherry-pick-merge-df.sh | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/t/t3509-cherry-pick-merge-df.sh b/t/t3509-cherry-pick-merge-df.sh index df921d1..a5b6a5f 100755 --- a/t/t3509-cherry-pick-merge-df.sh +++ b/t/t3509-cherry-pick-merge-df.sh @@ -10,17 +10,15 @@ test_expect_success 'Initialize repository' ' git commit -m a ' -test_expect_success SYMLINKS 'Setup rename across paths each below D/F conflicts' ' +test_expect_success 'Setup rename across paths each below D/F conflicts' ' mkdir b && - ln -s ../a b/a && - git add b && + test_ln_s_add ../a b/a && git commit -m b && git checkout -b branch && rm b/a && - mv a b/a && - ln -s b/a a && - git add . && + git mv a b/a && + test_ln_s_add b/a a && git commit -m swap && >f1 && @@ -28,7 +26,7 @@ test_expect_success SYMLINKS 'Setup rename across paths each below D/F conflicts git commit -m f1 ' -test_expect_success SYMLINKS 'Cherry-pick succeeds with rename across D/F conflicts' ' +test_expect_success 'Cherry-pick succeeds with rename across D/F conflicts' ' git reset --hard && git checkout master^0 && git cherry-pick branch |