use new fixture.sh + ignore the generated archive

Author: arumugamramaswamy

gix/src/open/repository.rs

@@ -308,10 +308,8 @@ impl ThreadSafeRepository {
                 worktree_dir = gix_path::realpath(&wt_path).ok();
                 // restore the relative path if possible after resolving the absolute path
                 if wt_path.is_relative() {
-                    if let Ok(cwd) = std::env::current_dir() {
-                        if let Some(rel_path) = worktree_dir.as_deref().and_then(|p| p.strip_prefix(&cwd).ok()) {
-                            worktree_dir = Some(rel_path.to_path_buf());
-                        }
+                    if let Some(rel_path) = worktree_dir.as_deref().and_then(|p| p.strip_prefix(&current_dir).ok()) {
+                        worktree_dir = Some(rel_path.to_path_buf());
                     }
                 }
 

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

@@ -8,4 +8,5 @@
 /make_signatures_repo.tar
 /make_diff_repos.tar
 /make_submodule_with_worktree.tar
-/repo_with_untracked_files.tar
+/repo_with_untracked_files.tar
+/make_submodule_with_symlinked_git_dir.tar

gix/tests/fixtures/make_submodule_with_symlinked_git_dir.sh

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+set -eu -o pipefail
+
+git init -q module1
+(cd module1
+  touch this
+  mkdir subdir
+  touch subdir/that
+  git add .
+  git commit -q -m c1
+  echo hello >> this
+  git commit -q -am c2
+  touch untracked
+)
+
+mkdir symlinked-git-dir
+(cd symlinked-git-dir
+  git init -q r1
+  (cd r1
+    git commit -q --allow-empty -m "init"
+  )
+
+  git config -f r1/.git/config core.worktree "$(pwd)"
+  ln -s r1/.git .git
+
+  git -c protocol.file.allow=always submodule add ../module1 m1
+  git commit -m "add module 1"
+)

gix/tests/fixtures/make_submodules.sh

@@ -151,18 +151,4 @@ git clone with-submodules not-a-submodule
   git add m1 && git commit -m "no submodule in index and commit, but in configuration"
 )
 
-git init unborn
-
-mkdir symlinked-git-dir
-(cd symlinked-git-dir
-  git init -q r1
-  (cd r1
-    git commit -q --allow-empty -m "init"
-  )
-
-  git config -f r1/.git/config core.worktree "$(pwd)"
-  ln -s r1/.git .git
-
-  git -c protocol.file.allow=always submodule add ../module1 m1
-  git commit -m "add module 1"
-)
+git init unborn

gix/tests/gix/status.rs

@@ -312,7 +312,12 @@ mod index_worktree {
 
         #[test]
         fn submodule_in_symlinked_dir() -> crate::Result {
-            let repo = submodule_repo("symlinked-git-dir")?;
+            use crate::util::named_subrepo_opts;
+            let repo = named_subrepo_opts(
+                "make_submodule_with_symlinked_git_dir.sh",
+                "symlinked-git-dir",
+                gix::open::Options::isolated(),
+            )?;
             let status = repo
                 .status(gix::progress::Discard)?
                 .index_worktree_options_mut(|opts| {