From 4ffc4372dff6595a86120ec0bd311c4cb5fb8ed6 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 May 2024 07:03:06 +0200 Subject: Merging upstream version 1.8.1+ds. Signed-off-by: Daniel Baumann --- tests/resources/testrepo/.gitted/config | 2 ++ tests/resources/testrepo/.gitted/config.worktree | 2 ++ .../testrepo/.gitted/worktrees/testrepo-worktree/config.worktree | 2 ++ 3 files changed, 6 insertions(+) create mode 100644 tests/resources/testrepo/.gitted/config.worktree create mode 100644 tests/resources/testrepo/.gitted/worktrees/testrepo-worktree/config.worktree (limited to 'tests/resources/testrepo/.gitted') diff --git a/tests/resources/testrepo/.gitted/config b/tests/resources/testrepo/.gitted/config index d011401..04d750a 100644 --- a/tests/resources/testrepo/.gitted/config +++ b/tests/resources/testrepo/.gitted/config @@ -3,6 +3,8 @@ filemode = true bare = false logallrefupdates = true +[extensions] + worktreeconfig = true [remote "test"] url = git://github.com/libgit2/libgit2 fetch = +refs/heads/*:refs/remotes/test/* diff --git a/tests/resources/testrepo/.gitted/config.worktree b/tests/resources/testrepo/.gitted/config.worktree new file mode 100644 index 0000000..df9f0ca --- /dev/null +++ b/tests/resources/testrepo/.gitted/config.worktree @@ -0,0 +1,2 @@ +[worktreetest] + config = mainrepo diff --git a/tests/resources/testrepo/.gitted/worktrees/testrepo-worktree/config.worktree b/tests/resources/testrepo/.gitted/worktrees/testrepo-worktree/config.worktree new file mode 100644 index 0000000..7a130a7 --- /dev/null +++ b/tests/resources/testrepo/.gitted/worktrees/testrepo-worktree/config.worktree @@ -0,0 +1,2 @@ +[worktreetest] + config = worktreerepo -- cgit v1.2.3