Merge pull request #1652 from EliahKagan/run-ci/chmod

Test cross-platform symlink and +x permission expectations on Windows

Author: Byron

gix-archive/tests/archive.rs

@@ -27,12 +27,6 @@ mod from_tree {
                 entry.read_to_end(&mut buf).expect("stream can always be read");
             }
 
-            let expected_link_mode = EntryKind::Link;
-            let expected_exe_mode = if cfg!(windows) {
-                EntryKind::Blob
-            } else {
-                EntryKind::BlobExecutable
-            };
             assert_eq!(
                 paths_and_modes,
                 &[
@@ -48,7 +42,7 @@ mod from_tree {
                     ),
                     (
                         "symlink-to-a".into(),
-                        expected_link_mode,
+                        EntryKind::Link,
                         hex_to_id("2e65efe2a145dda7ee51d1741299f848e5bf752e")
                     ),
                     (
@@ -58,7 +52,7 @@ mod from_tree {
                     ),
                     (
                         "dir/subdir/exe".into(),
-                        expected_exe_mode,
+                        EntryKind::BlobExecutable,
                         hex_to_id("e69de29bb2d1d6434b8b29ae775ad8c2e48c5391")
                     ),
                     (
@@ -68,7 +62,11 @@ mod from_tree {
                     ),
                     (
                         "extra-exe".into(),
-                        expected_exe_mode,
+                        if cfg!(windows) {
+                            EntryKind::Blob
+                        } else {
+                            EntryKind::BlobExecutable
+                        },
                         hex_to_id("0000000000000000000000000000000000000000")
                     ),
                     (
@@ -78,7 +76,7 @@ mod from_tree {
                     ),
                     (
                         "extra-dir/symlink-to-extra".into(),
-                        expected_link_mode,
+                        EntryKind::Link,
                         hex_to_id("0000000000000000000000000000000000000000")
                     )
                 ]
@@ -111,20 +109,23 @@ mod from_tree {
                     header.mode()?,
                 ));
             }
-            let expected_symlink_type = EntryType::Symlink;
-            let expected_exe_mode = if cfg!(windows) { 420 } else { 493 };
             assert_eq!(
                 out,
                 [
                     ("prefix/.gitattributes", EntryType::Regular, 56, 420),
                     ("prefix/a", EntryType::Regular, 3, 420),
-                    ("prefix/symlink-to-a", expected_symlink_type, 0, 420),
+                    ("prefix/symlink-to-a", EntryType::Symlink, 0, 420),
                     ("prefix/dir/b", EntryType::Regular, 3, 420),
-                    ("prefix/dir/subdir/exe", EntryType::Regular, 0, expected_exe_mode),
+                    ("prefix/dir/subdir/exe", EntryType::Regular, 0, 493),
                     ("prefix/extra-file", EntryType::Regular, 21, 420),
-                    ("prefix/extra-exe", EntryType::Regular, 0, expected_exe_mode),
+                    (
+                        "prefix/extra-exe",
+                        EntryType::Regular,
+                        0,
+                        if cfg!(windows) { 420 } else { 493 }
+                    ),
                     ("prefix/extra-dir-empty", EntryType::Directory, 0, 420),
-                    ("prefix/extra-dir/symlink-to-extra", expected_symlink_type, 0, 420)
+                    ("prefix/extra-dir/symlink-to-extra", EntryType::Symlink, 0, 420)
                 ]
                 .into_iter()
                 .map(|(path, b, c, d)| (bstr::BStr::new(path).to_owned(), b, c, d))

gix-archive/tests/fixtures/basic.sh

@@ -20,6 +20,7 @@ echo "/dir-ignored/ export-ignore" > .gitattributes
 echo "/file-ignored export-ignore" >> .gitattributes
 
 git add .
+git update-index --chmod=+x dir/subdir/exe  # For Windows.
 git commit -m "init"
 
 echo "extra to be streamed" > extra-file
@@ -28,4 +29,3 @@ mkdir extra-dir-empty extra-dir
 ln -s ../extra-file extra-dir/symlink-to-extra
 
 git rev-parse @^{tree} > head.hex
-

gix-dir/tests/fixtures/many-symlinks.sh

@@ -1,8 +1,7 @@
 #!/usr/bin/env bash
 set -eu -o pipefail
 
-# Note that symlink creation fails on Windows for some reason,
-# so these tests shouldn't be run there.
+# These fixtures use symlinks. See `many.sh` for some that don't.
 
 git init breakout-symlink
 (cd breakout-symlink
@@ -20,7 +19,7 @@ git init immediate-breakout-symlink
 
 git init excluded-symlinks-to-dir
 (cd excluded-symlinks-to-dir
-  cat <<EOF >.gitignore
+  cat <<'EOF' >.gitignore
 src1
 src2/
 file1
@@ -42,4 +41,4 @@ EOF
   ln -s src/file file2
 )
 
-ln -s excluded-symlinks-to-dir worktree-root-is-symlink
+ln -s excluded-symlinks-to-dir worktree-root-is-symlink

gix-dir/tests/fixtures/many.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -eu -o pipefail
 
-# Nothing here may use symlinks so these fixtures can be used on windows as well.
+# These fixtures don't use symlinks. See `many-symlinks.sh` for some that do.
 
 git init with-nested-dot-git
 (cd with-nested-dot-git

gix-dir/tests/walk/mod.rs

@@ -19,7 +19,6 @@ use gix_dir::walk::ForDeletionMode;
 use gix_ignore::Kind::*;
 
 #[test]
-#[cfg_attr(windows, ignore = "symlinks the way they are organized don't yet work on windows")]
 fn symlink_to_dir_can_be_excluded() -> crate::Result {
     let root = fixture_in("many-symlinks", "excluded-symlinks-to-dir");
     let ((out, _root), entries) = collect(&root, None, |keep, ctx| {
@@ -94,7 +93,6 @@ fn symlink_to_dir_can_be_excluded() -> crate::Result {
 }
 
 #[test]
-#[cfg_attr(windows, ignore = "symlinks the way they are organized don't yet work on windows")]
 fn root_may_not_lead_through_symlinks() -> crate::Result {
     for (name, intermediate, expected) in [
         ("immediate-breakout-symlink", "", 0),
@@ -121,7 +119,6 @@ fn root_may_not_lead_through_symlinks() -> crate::Result {
 }
 
 #[test]
-#[cfg_attr(windows, ignore = "symlinks the way they are organized don't yet work on windows")]
 fn root_may_be_a_symlink_if_it_is_the_worktree() -> crate::Result {
     let root = fixture_in("many-symlinks", "worktree-root-is-symlink");
     let ((_out, _root), entries) = collect(&root, None, |keep, ctx| {
@@ -2702,7 +2699,6 @@ fn decomposed_unicode_in_directory_is_returned_precomposed() -> crate::Result {
 }
 
 #[test]
-#[cfg_attr(windows, ignore = "symlinks the way they are organized don't yet work on windows")]
 fn worktree_root_can_be_symlink() -> crate::Result {
     let root = fixture_in("many-symlinks", "symlink-to-breakout-symlink");
     let troot = root.join("file");

gix-index/tests/fixtures/generated-archives/v2_all_file_kinds.tar

@@ -1,11 +1,10 @@
 #!/usr/bin/env bash
 set -eu -o pipefail
 
-export GIT_INDEX_VERSION=2;
+export GIT_INDEX_VERSION=2
 
 git init -q sub
 (cd sub
-
   touch a b c
   git add .
   git commit -m "init"
@@ -21,6 +20,7 @@ mkdir d
 (cd d && touch a b c)
 
 git add .
+git update-index --chmod=+x b  # For Windows.
 git commit -m "init"
 
 git rev-parse @^{tree} > head.tree

gix-index/tests/fixtures/make_index/v2_all_file_kinds.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -eu -o pipefail
 
-export GIT_INDEX_VERSION=2;
+export GIT_INDEX_VERSION=2
 
 mkdir sub
 (cd sub
@@ -25,4 +25,5 @@ mkdir d
 )
 
 git add .
+git update-index --chmod=+x b  # For Windows.
 git commit -m "init"

gix-index/tests/fixtures/make_index/v2_deeper_tree.sh

@@ -475,8 +475,8 @@ git init same-rename-different-mode
 
   git checkout A
   write_lines 1 2 3 4 5 >a/x.f
-  chmod +x a/x.f
-  chmod +x a/w
+  chmod +x a/x.f a/w
+  git update-index --chmod=+x a/x.f a/w
   git mv a a-renamed
   git commit -am "changed all content, add +x, renamed a -> a-renamed"
 
@@ -486,8 +486,8 @@ git init same-rename-different-mode
   git commit -am "changed all content, renamed a -> a-renamed"
 
   git checkout expected
-  chmod +x a/x.f
-  chmod +x a/w
+  chmod +x a/x.f a/w
+  git update-index --chmod=+x a/x.f a/w
   write_lines 1 2 3 4 5 6 >a/x.f
   git mv a a-renamed
   git commit -am "Git, when branches are reversed, doesn't keep the +x flag on a/w so we specify our own expectation"
@@ -530,13 +530,13 @@ git init added-file-changed-content-and-mode
   git checkout B
   write_lines original 1 2 3 4 5 6 >new
   chmod +x new
-  git add .
+  git add --chmod=+x new
   git commit -m "add new with content B and +x"
 
   git checkout expected
   echo -n $'<<<<<<< A\n1\n2\n3\n4\n5\n=======\noriginal\n1\n2\n3\n4\n5\n6\n>>>>>>> B\n' >new
   chmod +x new
-  git add new
+  git add --chmod=+x new
   git commit -m "Git has a better merge here, but that's due to better hunk handling/hunk splitting. We, however, consistently use +x"
 )