Merge branch 'dev-on-linux'

.github/workflows/ci.yml

@@ -52,6 +52,7 @@ jobs:
     - name: test
       env:
         CI: true
+        GITOXIDE_TEST_IGNORE_ARCHIVES: 1
       run: just ci-test
 
   test-fast:
@@ -60,6 +61,7 @@ jobs:
         os:
           - windows-latest
           - macos-latest
+          - ubuntu-latest
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3

gix-archive/tests/archive.rs

@@ -18,7 +18,7 @@ mod from_tree {
     #[test]
     fn basic_usage_internal() -> gix_testtools::Result {
         basic_usage(gix_archive::Format::InternalTransientNonPersistable, |buf| {
-            assert_eq!(buf.len(), 551);
+            assert_eq!(buf.len(), if cfg!(windows) { 565 } else { 551 });
 
             let mut stream = gix_worktree_stream::Stream::from_read(std::io::Cursor::new(buf));
             let mut paths_and_modes = Vec::new();
@@ -28,7 +28,12 @@ mod from_tree {
                 entry.read_to_end(&mut buf).expect("stream can always be read");
             }
 
-            let expected_extra_exe_mode = if cfg!(windows) {
+            let expected_link_mode = if cfg!(windows) {
+                EntryMode::Blob
+            } else {
+                EntryMode::Link
+            };
+            let expected_exe_mode = if cfg!(windows) {
                 EntryMode::Blob
             } else {
                 EntryMode::BlobExecutable
@@ -48,8 +53,12 @@ mod from_tree {
                     ),
                     (
                         "symlink-to-a".into(),
-                        EntryMode::Link,
-                        hex_to_id("2e65efe2a145dda7ee51d1741299f848e5bf752e")
+                        expected_link_mode,
+                        hex_to_id(if cfg!(windows) {
+                            "45b983be36b73c0788dc9cbcb76cbb80fc7bb057"
+                        } else {
+                            "2e65efe2a145dda7ee51d1741299f848e5bf752e"
+                        })
                     ),
                     (
                         "dir/b".into(),
@@ -58,7 +67,7 @@ mod from_tree {
                     ),
                     (
                         "dir/subdir/exe".into(),
-                        EntryMode::BlobExecutable,
+                        expected_exe_mode,
                         hex_to_id("e69de29bb2d1d6434b8b29ae775ad8c2e48c5391")
                     ),
                     (
@@ -68,7 +77,7 @@ mod from_tree {
                     ),
                     (
                         "extra-exe".into(),
-                        expected_extra_exe_mode,
+                        expected_exe_mode,
                         hex_to_id("0000000000000000000000000000000000000000")
                     ),
                     (
@@ -78,7 +87,7 @@ mod from_tree {
                     ),
                     (
                         "extra-dir/symlink-to-extra".into(),
-                        EntryMode::Link,
+                        expected_link_mode,
                         hex_to_id("0000000000000000000000000000000000000000")
                     )
                 ]
@@ -111,19 +120,34 @@ mod from_tree {
                     header.mode()?,
                 ));
             }
-            let expected_extra_exe_mode = if cfg!(windows) { 420 } else { 493 };
+            let expected_symlink_type = if cfg!(windows) {
+                EntryType::Regular
+            } else {
+                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", EntryType::Symlink, 0, 420),
+                    (
+                        "prefix/symlink-to-a",
+                        expected_symlink_type,
+                        if cfg!(windows) { 3 } else { 0 },
+                        420
+                    ),
                     ("prefix/dir/b", EntryType::Regular, 3, 420),
-                    ("prefix/dir/subdir/exe", EntryType::Regular, 0, 493),
+                    ("prefix/dir/subdir/exe", EntryType::Regular, 0, expected_exe_mode),
                     ("prefix/extra-file", EntryType::Regular, 21, 420),
-                    ("prefix/extra-exe", EntryType::Regular, 0, expected_extra_exe_mode),
+                    ("prefix/extra-exe", EntryType::Regular, 0, expected_exe_mode),
                     ("prefix/extra-dir-empty", EntryType::Directory, 0, 420),
-                    ("prefix/extra-dir/symlink-to-extra", EntryType::Symlink, 0, 420)
+                    (
+                        "prefix/extra-dir/symlink-to-extra",
+                        expected_symlink_type,
+                        if cfg!(windows) { 21 } else { 0 },
+                        420
+                    )
                 ]
                 .into_iter()
                 .map(|(path, b, c, d)| (bstr::BStr::new(path).to_owned(), b, c, d))
@@ -155,8 +179,8 @@ mod from_tree {
             },
             |buf| {
                 assert!(
-                    buf.len() < 1200,
-                    "bigger than uncompressed for some reason: {} < 1200",
+                    buf.len() < 1220,
+                    "bigger than uncompressed for some reason: {} < 1220",
                     buf.len()
                 );
                 let mut ar = zip::ZipArchive::new(std::io::Cursor::new(buf.as_slice()))?;
@@ -181,10 +205,14 @@ mod from_tree {
                 let mut link = ar.by_name("prefix/symlink-to-a")?;
                 assert!(!link.is_dir());
                 assert!(link.is_file(), "no symlink differentiation");
-                assert_eq!(link.unix_mode(), Some(0o120644), "it's all in the mode");
+                assert_eq!(
+                    link.unix_mode(),
+                    Some(if cfg!(windows) { 0o100644 } else { 0o120644 }),
+                    "the mode specifies what it should be"
+                );
                 let mut buf = Vec::new();
                 link.read_to_end(&mut buf)?;
-                assert_eq!(buf.as_bstr(), "a");
+                assert_eq!(buf.as_bstr(), if cfg!(windows) { "hi\n" } else { "a" });
                 Ok(())
             },
         )

gix-archive/tests/fixtures/basic.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 set -eu -o pipefail
 
 git init

gix-archive/tests/fixtures/generated-archives/.gitignore

@@ -0,0 +1 @@
+basic.tar.xz

gix-command/tests/command.rs

@@ -31,17 +31,15 @@ mod spawn {
     #[test]
     #[cfg(unix)]
     fn disallow_shell() -> crate::Result {
-        let out = gix_command::prepare("echo hi")
+        let out = gix_command::prepare("PATH= echo hi")
             .with_shell()
             .spawn()?
             .wait_with_output()?;
         assert_eq!(out.stdout.as_bstr(), "hi\n");
+
+        let mut cmd: std::process::Command = gix_command::prepare("echo hi").with_shell().without_shell().into();
         assert!(
-            gix_command::prepare("echo hi")
-                .with_shell()
-                .without_shell()
-                .spawn()
-                .is_err(),
+            cmd.env_remove("PATH").spawn().is_err(),
             "no command named 'echo hi' exists"
         );
         Ok(())

gix-filter/tests/fixtures/baseline.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 set -eu -o pipefail
 
 driver=${1:?First argument is the driver program supporting both process mode and clean/smudge}

gix-filter/tests/fixtures/pipeline_repos.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 set -eu -o pipefail
 
 (mkdir all-filters && cd all-filters

gix-worktree-stream/tests/fixtures/basic.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 set -eu -o pipefail
 
 git init

gix-worktree-stream/tests/stream.rs

@@ -103,11 +103,16 @@ mod from_tree {
             }
         }
 
-        let expected_extra_exe_mode = if cfg!(windows) {
+        let expected_exe_mode = if cfg!(windows) {
             EntryMode::Blob
         } else {
             EntryMode::BlobExecutable
         };
+        let expected_link_mode = if cfg!(windows) {
+            EntryMode::Blob
+        } else {
+            EntryMode::Link
+        };
         assert_eq!(
             paths_and_modes,
             &[
@@ -128,8 +133,12 @@ mod from_tree {
                 ),
                 (
                     "symlink-to-a".into(),
-                    EntryMode::Link,
-                    hex_to_id("2e65efe2a145dda7ee51d1741299f848e5bf752e")
+                    expected_link_mode,
+                    hex_to_id(if cfg!(windows) {
+                        "45b983be36b73c0788dc9cbcb76cbb80fc7bb057"
+                    } else {
+                        "2e65efe2a145dda7ee51d1741299f848e5bf752e"
+                    })
                 ),
                 (
                     "dir/.gitattributes".into(),
@@ -143,7 +152,7 @@ mod from_tree {
                 ),
                 (
                     "dir/subdir/exe".into(),
-                    EntryMode::BlobExecutable,
+                    expected_exe_mode,
                     hex_to_id("e69de29bb2d1d6434b8b29ae775ad8c2e48c5391")
                 ),
                 (
@@ -163,7 +172,7 @@ mod from_tree {
                 ),
                 (
                     "extra-exe".into(),
-                    expected_extra_exe_mode,
+                    expected_exe_mode,
                     hex_to_id("0000000000000000000000000000000000000000")
                 ),
                 (
@@ -173,7 +182,7 @@ mod from_tree {
                 ),
                 (
                     "extra-dir/symlink-to-extra".into(),
-                    EntryMode::Link,
+                    expected_link_mode,
                     hex_to_id("0000000000000000000000000000000000000000")
                 )
             ]

gix-worktree/tests/fixtures/generated-archives/.gitignore

@@ -1,5 +1,7 @@
 make_ignore_and_attributes_setup.tar.xz
 make_mixed_without_submodules.tar.xz
 make_mixed_without_submodules_and_symlinks.tar.xz
+make_attributes_baseline.tar.xz
+make_dangerous_symlink.tar.xz
 status_unchanged.tar.xz
 status_changed.tar.xz

gix/tests/fixtures/make_config_repos.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 set -eu -o pipefail
 
 git init http-config

gix/tests/fixtures/make_fetch_repos.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 set -eu -o pipefail
 
 # IMPORTANT: keep this repo small as it's used for writes, hence will be executed for each writer!

gix/tests/fixtures/make_remote_repos.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 set -eu -o pipefail
 
 function tick () {

tests/tools/src/lib.rs

@@ -476,7 +476,7 @@ fn scripted_fixture_read_only_with_args_inner(
                 }
                 assert!(
                     output.status.success(),
-                    "fixture script failed: stdout: {}\nstderr: {}",
+                    "fixture script of {cmd:?} failed: stdout: {}\nstderr: {}",
                     output.stdout.as_bstr(),
                     output.stderr.as_bstr()
                 );