[gin]: Not a directory (os error 20): stat '{repo-name}/{worktree-name}/.git/MERGE_HEAD' with action: chaperon on a git-worktree

[aiya000]

Hi :D
I have an issue of SSIA.

I'm using git worktrees.
e.g.

$ git clone {repo-name}
$ cd {repo-name}
$ git worktree add develop develop
$ cd

In above worktee, when opening with GinStatus, and choise action: chaperon,
then the title issue is shown.

Will you help me? Thanks!

[lambdalisue]

Could you share me an example git repository that can reproduce this issue and exact steps to reproduce the situation? I seldom use git's worktree feature so there might be something I don't realize.

[aiya000]

This issue can reproduce from git init 🙋
Below is actual reproduction.

---

NOTE: These are my aliases :)

$ alias gaacm
gaacm='git add -A && git commit -m'

$ which gwab
gwab () {
        : Makes the new branch basing on a base branch.
        base_branch=$1
        new_branch=$2
        git worktree add -b "$new_branch" "${new_branch//\#/}" "$base_branch"
}

$ alias ..
..='cd ../'

---

The reproduction.

# Making repository
$ mkdir foo
$ cd foo
$ git init
$ touch a
$ gaacm a

# Making 'b' branch
$ gwab main b
$ cd b
$ echo b >> a
$ gaacm b

# Making 'c' branch
$ gwab main c
$ cd c
$ echo c >> a
$ gaacm c

# Making a conflict
$ ..
$ cd b
$ git merge c

# Final
$ vim
: GinStatus
(action: chaperon)
[gin]: Not a directory (os error 20): stat '/home/aiya000/.tmp/foo/b/.git/MERGE_HEAD'

[lambdalisue]

I'm sorry but could you rewrite it without your aliases so that I can test it in my environment?

[aiya000]

Alright :)

$ mkdir foo
$ cd foo
$ git init
$ touch a
$ git commit -m a

$ git worktree add -b b b main
$ cd b
$ echo b >> a
$ git commit -m b

$ git worktree add -b c c main
$ cd c
$ echo c >> a
$ git commit -m c

$ cd ..
$ cd b
$ git merge c

$ vim
:GinStatus
(action: chaperon)
[gin]: Not a directory (os error 20): stat '/home/aiya000/.tmp/foo/b/.git/MERGE_HEAD'

[lambdalisue]

Reproduced with a bit modified steps

$ mkdir foo
$ cd foo
$ git init
$ touch a
$ git add .
$ git commit -m a

$ git worktree add -b b b main
$ cd b
$ echo b >> a
$ git add .
$ git commit -m b

$ git worktree add -b c c main
$ cd c
$ echo c >> a
$ git add .
$ git commit -m c

$ cd ../
$ cd b
$ git merge c

$ vim
:GinStatus
(action: chaperon)
[gin]: Not a directory (os error 20): stat '/home/aiya000/.tmp/foo/b/.git/MERGE_HEAD'

[lambdalisue]

@aiya000 Please test #147

[aiya000]

@lambdalisue
It seems working correctly!
Thanks!