commit dd6165e49c3235f6e7c8bf7e2c1f9635009f08a4 from: Stefan Sperling via: Thomas Adam date: Tue Sep 21 20:55:42 2021 UTC regress: fix test failures using ln(1) GNU ln uses -T instead of -h for no-target-directory. OK thomas.adam commit - 180f111d564b657f44e4182cd43fcfbdd40096bc commit + dd6165e49c3235f6e7c8bf7e2c1f9635009f08a4 blob - fb48a56bcaee4c1b91848964e57ec9ebfcfef84d blob + 1208cc97c5c0e642c229074f383d6763516e54f6 --- regress/cmdline/cherrypick.sh +++ regress/cmdline/cherrypick.sh @@ -453,7 +453,7 @@ test_cherrypick_modified_symlinks() { got checkout -b foo $testroot/repo $testroot/wt > /dev/null (cd $testroot/repo && ln -sf beta alpha.link) - (cd $testroot/repo && ln -sfh gamma epsilon.link) + (cd $testroot/repo && ln -sfT gamma epsilon.link) (cd $testroot/repo && ln -sf ../gamma/delta epsilon/beta.link) (cd $testroot/repo && ln -sf .got/bar $testroot/repo/dotgotfoo.link) (cd $testroot/repo && git rm -q nonexistent.link) @@ -564,7 +564,7 @@ test_cherrypick_symlink_conflicts() { (cd $testroot/repo && ln -sf beta alpha.link) (cd $testroot/repo && ln -sf beta boo.link) - (cd $testroot/repo && ln -sfh gamma epsilon.link) + (cd $testroot/repo && ln -sfT gamma epsilon.link) (cd $testroot/repo && ln -sf ../gamma/delta epsilon/beta.link) echo 'this is regular file foo' > $testroot/repo/dotgotfoo.link (cd $testroot/repo && ln -sf .got/bar dotgotbar.link) @@ -581,9 +581,9 @@ test_cherrypick_symlink_conflicts() { # modified symlink to file A vs modified symlink to file B (cd $testroot/wt && ln -sf gamma/delta alpha.link) # modified symlink to dir A vs modified symlink to file B - (cd $testroot/wt && ln -sfh beta epsilon.link) + (cd $testroot/wt && ln -sfT beta epsilon.link) # modeified symlink to file A vs modified symlink to dir B - (cd $testroot/wt && ln -sfh ../gamma epsilon/beta.link) + (cd $testroot/wt && ln -sfT ../gamma epsilon/beta.link) # added regular file A vs added bad symlink to file A (cd $testroot/wt && ln -sf .got/bar dotgotfoo.link) (cd $testroot/wt && got add dotgotfoo.link > /dev/null) blob - 7ec03bec2d52a6057271e13b0db522b72920403d blob + 22b98dd9f7ee723fd045ee9edb92fdbcdc75df98 --- regress/cmdline/commit.sh +++ regress/cmdline/commit.sh @@ -1188,7 +1188,7 @@ test_commit_symlink() { fi (cd $testroot/wt && ln -sf beta alpha.link) - (cd $testroot/wt && ln -sfh gamma epsilon.link) + (cd $testroot/wt && ln -sfT gamma epsilon.link) rm $testroot/wt/epsilon/beta.link echo "this is a regular file" > $testroot/wt/epsilon/beta.link (cd $testroot/wt && ln -sf .got/bar dotgotbar.link) @@ -1299,7 +1299,7 @@ test_commit_fix_bad_symlink() { fi # change "bad" symlink back into a "good" symlink - (cd $testroot/wt && ln -sfh alpha passwd.link) + (cd $testroot/wt && ln -sfT alpha passwd.link) (cd $testroot/wt && got commit -m 'fix bad symlink' \ > $testroot/stdout) blob - 5d259e7e69fb72c30e2d546a71895f1edb136f69 blob + 9987502cc2a56a00f9c9a0960fb32f8ba17770df --- regress/cmdline/diff.sh +++ regress/cmdline/diff.sh @@ -384,7 +384,7 @@ test_diff_symlinks_in_work_tree() { fi (cd $testroot/wt && ln -sf beta alpha.link) - (cd $testroot/wt && ln -sfh gamma epsilon.link) + (cd $testroot/wt && ln -sfT gamma epsilon.link) (cd $testroot/wt && ln -sf ../gamma/delta epsilon/beta.link) echo -n '.got/bar' > $testroot/wt/dotgotfoo.link (cd $testroot/wt && got rm nonexistent.link > /dev/null) @@ -481,7 +481,7 @@ test_diff_symlinks_in_repo() { local commit_id1=`git_show_head $testroot/repo` (cd $testroot/repo && ln -sf beta alpha.link) - (cd $testroot/repo && ln -sfh gamma epsilon.link) + (cd $testroot/repo && ln -sfT gamma epsilon.link) (cd $testroot/repo && ln -sf ../gamma/delta epsilon/beta.link) (cd $testroot/repo && ln -sf .got/bar $testroot/repo/dotgotfoo.link) (cd $testroot/repo && git rm -q nonexistent.link) blob - 9766243def1b9ea970812bb138d4d8aeda056a96 blob + f7324aa77b41d0836e1e4afad7db548534175ace --- regress/cmdline/revert.sh +++ regress/cmdline/revert.sh @@ -1071,11 +1071,11 @@ test_revert_symlink() { # symlink to file A now points to file B (cd $testroot/wt && ln -sf gamma/delta alpha.link) # symlink to a directory A now points to file B - (cd $testroot/wt && ln -sfh beta epsilon.link) + (cd $testroot/wt && ln -sfT beta epsilon.link) # "bad" symlink now contains a different target path echo "foo" > $testroot/wt/passwd.link # relative symlink to directory A now points to relative directory B - (cd $testroot/wt && ln -sfh ../gamma epsilon/beta.link) + (cd $testroot/wt && ln -sfT ../gamma epsilon/beta.link) # an unversioned symlink (cd $testroot/wt && ln -sf .got/foo dotgotfoo.link) # symlink to file A now points to non-existent file B @@ -1244,11 +1244,11 @@ test_revert_patch_symlink() { # symlink to file A now points to file B (cd $testroot/wt && ln -sf gamma/delta alpha.link) # symlink to a directory A now points to file B - (cd $testroot/wt && ln -sfh beta epsilon.link) + (cd $testroot/wt && ln -sfT beta epsilon.link) # "bad" symlink now contains a different target path echo "foo" > $testroot/wt/passwd.link # relative symlink to directory A now points to relative directory B - (cd $testroot/wt && ln -sfh ../gamma epsilon/beta.link) + (cd $testroot/wt && ln -sfT ../gamma epsilon/beta.link) # an unversioned symlink (cd $testroot/wt && ln -sf .got/foo dotgotfoo.link) # symlink to file A now points to non-existent file B blob - 8e7009b68305bcecb73914412de27d91708eb4ef blob + fa6a5ec7f7ae7fc88dcd3d405a9edc036a9eb6b3 --- regress/cmdline/stage.sh +++ regress/cmdline/stage.sh @@ -2373,7 +2373,7 @@ test_stage_symlink() { fi (cd $testroot/wt && ln -sf beta alpha.link) - (cd $testroot/wt && ln -sfh gamma epsilon.link) + (cd $testroot/wt && ln -sfT gamma epsilon.link) (cd $testroot/wt && ln -sf ../gamma/delta epsilon/beta.link) echo 'this is regular file foo' > $testroot/wt/dotgotfoo.link (cd $testroot/wt && got add dotgotfoo.link > /dev/null) @@ -2685,7 +2685,7 @@ test_stage_patch_symlink() { fi (cd $testroot/wt && ln -sf beta alpha.link) - (cd $testroot/wt && ln -sfh gamma epsilon.link) + (cd $testroot/wt && ln -sfT gamma epsilon.link) (cd $testroot/wt && ln -sf ../gamma/delta epsilon/beta.link) echo 'this is regular file foo' > $testroot/wt/dotgotfoo.link (cd $testroot/wt && got add dotgotfoo.link > /dev/null) blob - de94a6e129b914a487c98dde2b1cc0d59698c4cd blob + 6be568608fffc628917f8f2684672943768ae46e --- regress/cmdline/status.sh +++ regress/cmdline/status.sh @@ -291,7 +291,7 @@ test_status_symlink() { fi (cd $testroot/wt && ln -sf beta alpha.link) - (cd $testroot/wt && ln -sfh gamma epsilon.link) + (cd $testroot/wt && ln -sfT gamma epsilon.link) (cd $testroot/wt && ln -s /etc/passwd passwd.link) (cd $testroot/wt && ln -s ../beta epsilon/beta.link) blob - 053325225ecc1c55962ba876ee2610f161762fa3 blob + 3b3d58a2e081bceb00cc302ffc67e0ab03817dd7 --- regress/cmdline/unstage.sh +++ regress/cmdline/unstage.sh @@ -973,7 +973,7 @@ test_unstage_symlink() { fi (cd $testroot/wt && ln -sf beta alpha.link) - (cd $testroot/wt && ln -sfh gamma epsilon.link) + (cd $testroot/wt && ln -sfT gamma epsilon.link) (cd $testroot/wt && ln -sf ../gamma/delta epsilon/beta.link) echo 'this is regular file foo' > $testroot/wt/dotgotfoo.link (cd $testroot/wt && got add dotgotfoo.link > /dev/null) @@ -1159,11 +1159,11 @@ test_unstage_patch_symlink() { # symlink to file A now points to file B (cd $testroot/wt && ln -sf gamma/delta alpha.link) # symlink to a directory A now points to file B - (cd $testroot/wt && ln -sfh beta epsilon.link) + (cd $testroot/wt && ln -sfT beta epsilon.link) # "bad" symlink now contains a different target path echo "foo" > $testroot/wt/passwd.link # relative symlink to directory A now points to relative directory B - (cd $testroot/wt && ln -sfh ../gamma epsilon/beta.link) + (cd $testroot/wt && ln -sfT ../gamma epsilon/beta.link) # an unversioned symlink (cd $testroot/wt && ln -sf .got/foo dotgotfoo.link) # symlink to file A now points to non-existent file B blob - cae602420f097ed69b049e9fffb3fc46510d2de5 blob + 495406fdbcdfc1bcce4fe3a964b422ebaa832cff --- regress/cmdline/update.sh +++ regress/cmdline/update.sh @@ -2016,7 +2016,7 @@ test_update_symlink_conflicts() { fi (cd $testroot/repo && ln -sf beta alpha.link) - (cd $testroot/repo && ln -sfh gamma epsilon.link) + (cd $testroot/repo && ln -sfT gamma epsilon.link) (cd $testroot/repo && ln -sf ../gamma/delta epsilon/beta.link) echo 'this is regular file foo' > $testroot/repo/dotgotfoo.link (cd $testroot/repo && ln -sf .got/bar dotgotbar.link) @@ -2030,9 +2030,9 @@ test_update_symlink_conflicts() { # modified symlink to file A vs modified symlink to file B (cd $testroot/wt && ln -sf gamma/delta alpha.link) # modified symlink to dir A vs modified symlink to file B - (cd $testroot/wt && ln -sfh beta epsilon.link) + (cd $testroot/wt && ln -sfT beta epsilon.link) # modeified symlink to file A vs modified symlink to dir B - (cd $testroot/wt && ln -sfh ../gamma epsilon/beta.link) + (cd $testroot/wt && ln -sfT ../gamma epsilon/beta.link) # added regular file A vs added bad symlink to file A (cd $testroot/wt && ln -sf .got/bar dotgotfoo.link) (cd $testroot/wt && got add dotgotfoo.link > /dev/null)