fix(#1976): improve `$GIT_DIR` handling #2012

dmehala · 2023-02-19T15:39:53Z

Retrieve $GIT_DIR using git rev-parse --absolute-git-dir
Move $GIT_DIR ignore in the project exploration part

Resolves #1976

- Retrieve $GIT_DIR using `git rev-parse --absolute-git-dir` - Move $GIT_DIR ignore in the project exploration part Resolves nvim-tree#1976

alex-courtis · 2023-02-20T00:16:53Z

Using a clean room environment with watcher and git logs enabled.

Testing with a default .git setup had issues around identifying the .git directory. Follwing any git status it appears to be treated as a normal directory, with watchers etc. created.

setup

mkdir default
cd default
git init
touch x
git add x
git commit -m "initial commit"

master

open tree
.git is shown
touch x

[2023-02-20 11:04:32] [watcher] event_cb '/home/alex/1976/default' 'x'
[2023-02-20 11:04:32] [watcher] node event scheduled refresh explorer:watch:/home/alex/1976/default:1
[2023-02-20 11:04:32] [watcher] node event executing refresh '/home/alex/1976/default'
[2023-02-20 11:04:32] [git] running job with timeout 400ms
[2023-02-20 11:04:32] [git] git --no-optional-locks status --porcelain=v1 -z --ignored=matching -u /home/alex/1976/default
[2023-02-20 11:04:32] [git] job success    /home/alex/1976/default /home/alex/1976/default

touch .git/config

[2023-02-20 11:04:52] [watcher] event_cb '/home/alex/1976/default/.git' 'config'
[2023-02-20 11:04:52] [watcher] git event scheduled '/home/alex/1976/default'
[2023-02-20 11:04:52] [watcher] git event executing '/home/alex/1976/default'
[2023-02-20 11:04:52] [git] running job with timeout 400ms
[2023-02-20 11:04:52] [git] git --no-optional-locks status --porcelain=v1 -z --ignored=matching -u
[2023-02-20 11:04:52] [git] job success    /home/alex/1976/default nil

branch

open tree
.git is not shown
touch x

[2023-02-20 11:05:29] [watcher] event_cb '/home/alex/1976/default' 'x'
[2023-02-20 11:05:29] [watcher] node event scheduled refresh explorer:watch:/home/alex/1976/default:1
[2023-02-20 11:05:29] [watcher] node event executing refresh '/home/alex/1976/default'
[2023-02-20 11:05:29] [git] running job with timeout 400ms
[2023-02-20 11:05:29] [git] git --no-optional-locks status --porcelain=v1 -z --ignored=matching -u /home/alex/1976/default
[2023-02-20 11:05:29] [git] job success    /home/alex/1976/default /home/alex/1976/default
[2023-02-20 11:05:29] [watcher] Watcher:new '/home/alex/1976/default/.git' nil

.git is now shown
touch .git/config

[2023-02-20 11:06:00] [watcher] event_cb '/home/alex/1976/default/.git' 'config'
[2023-02-20 11:06:00] [watcher] git event scheduled '/home/alex/1976/default'
[2023-02-20 11:06:00] [watcher] node event scheduled refresh explorer:watch:/home/alex/1976/default/.git:4
[2023-02-20 11:06:00] [watcher] git event executing '/home/alex/1976/default'
[2023-02-20 11:06:00] [git] running job with timeout 400ms
[2023-02-20 11:06:00] [git] git --no-optional-locks status --porcelain=v1 -z --ignored=matching -u
[2023-02-20 11:06:00] [watcher] node event executing refresh '/home/alex/1976/default/.git'
[2023-02-20 11:06:00] [git] { "git", "-C", "/home/alex/1976/default/.git", "rev-parse", "--show-toplevel" }
fatal: this operation must be run in a work tree
[2023-02-20 11:06:00] [watcher] Watcher:new '/home/alex/1976/default/.git/branches' nil
[2023-02-20 11:06:00] [watcher] Event:new '/home/alex/1976/default/.git/branches'
[2023-02-20 11:06:00] [watcher] Event:start '/home/alex/1976/default/.git/branches'
[2023-02-20 11:06:00] [watcher] Watcher:new '/home/alex/1976/default/.git/hooks' nil
[2023-02-20 11:06:00] [watcher] Event:new '/home/alex/1976/default/.git/hooks'
[2023-02-20 11:06:00] [watcher] Event:start '/home/alex/1976/default/.git/hooks'
[2023-02-20 11:06:00] [watcher] Watcher:new '/home/alex/1976/default/.git/info' nil
[2023-02-20 11:06:00] [watcher] Event:new '/home/alex/1976/default/.git/info'
[2023-02-20 11:06:00] [watcher] Event:start '/home/alex/1976/default/.git/info'
[2023-02-20 11:06:00] [watcher] Watcher:new '/home/alex/1976/default/.git/logs' nil
[2023-02-20 11:06:00] [watcher] Event:new '/home/alex/1976/default/.git/logs'
[2023-02-20 11:06:00] [watcher] Event:start '/home/alex/1976/default/.git/logs'
[2023-02-20 11:06:00] [watcher] Watcher:new '/home/alex/1976/default/.git/objects' nil
[2023-02-20 11:06:00] [watcher] Event:new '/home/alex/1976/default/.git/objects'
[2023-02-20 11:06:00] [watcher] Event:start '/home/alex/1976/default/.git/objects'
[2023-02-20 11:06:00] [watcher] Watcher:new '/home/alex/1976/default/.git/refs' nil
[2023-02-20 11:06:00] [watcher] Event:new '/home/alex/1976/default/.git/refs'
[2023-02-20 11:06:00] [watcher] Event:start '/home/alex/1976/default/.git/refs'
[2023-02-20 11:06:00] [git] job success    /home/alex/1976/default nil

alex-courtis

Looking good so far.

Initial testing shows things are mostly working for a default .git directory and a user specified one.

Please:

test cygwin / WSL
use a norm_path from utils.lua
deal with fix(#1976): improve $GIT_DIR handling #2012 (comment)

lua/nvim-tree/git/utils.lua

lua/nvim-tree/git/init.lua

lua/nvim-tree/git/utils.lua

dmehala · 2023-02-26T08:09:07Z

Thanks for your feedback @alex-courtis. I hope I will have time today or tomorrow to improve the PR.

- move norm_path to utils.lua - fix comment nvim-tree#2012

dmehala · 2023-03-04T21:59:06Z

I think I've fixed #2012 comment. However, I was not able to test on cygwin and WSL, to be honest, I just reused code already written.

alex-courtis · 2023-03-05T01:54:12Z

I think I've fixed #2012 comment. However, I was not able to test on cygwin and WSL, to be honest, I just reused code already written.

Ah, damn. I assumed you were using windows.

Do you have a windows environment you can test with?

The code looks the same, however I am nervous...

lua/nvim-tree/utils.lua

alex-courtis

This appears to work for default and different git dirs. I'll fully test once we sort out the watcher ignores.

Please:

lua/nvim-tree/git/init.lua

alex-courtis

Please:

@dmehala Tidy watch.lua fix(#1976): improve $GIT_DIR handling #2012 (comment)
@dmehala Remove unnecessary git call https://github.com/nvim-tree/nvim-tree.lua/pull/2012/files#r1125590684
@alex-courtis Document assumptions

alex-courtis · 2023-04-11T04:57:30Z

Any updates on this one @dmehala ?

dmehala · 2023-04-12T08:11:12Z

Hey @alex-courtis,

Sorry for the late reply, I think I've manage to follow your requirements in 5a83629. May you have a look? :)

alex-courtis · 2023-04-15T05:27:00Z

Experimental async git status handling has been added #2104

Please do test this.

I am dogfooding this branch, with async enabled for ~week.

gegoune · 2023-04-15T06:17:49Z

I have been using it for a while, didn't notice any issues.

EDIT: meant #2104 - async git, to be clear.

alex-courtis

Many thanks for your contribution @dmehala !

* Improve $GIT_DIR handling - Retrieve $GIT_DIR using `git rev-parse --absolute-git-dir` - Move $GIT_DIR ignore in the project exploration part Resolves nvim-tree#1976 * Code review - move norm_path to utils.lua - fix comment nvim-tree#2012 * add comments for utils.norm_path * get_git_directory use norm_path from utils * watcher improvements --------- Co-authored-by: Alexander Courtis <alex@courtis.org>

This reverts commit 517dee6.

* Improve $GIT_DIR handling - Retrieve $GIT_DIR using `git rev-parse --absolute-git-dir` - Move $GIT_DIR ignore in the project exploration part Resolves nvim-tree#1976 * Code review - move norm_path to utils.lua - fix comment nvim-tree#2012 * add comments for utils.norm_path * get_git_directory use norm_path from utils * watcher improvements --------- Co-authored-by: Alexander Courtis <alex@courtis.org>

Improve $GIT_DIR handling

5860ac3

- Retrieve $GIT_DIR using `git rev-parse --absolute-git-dir` - Move $GIT_DIR ignore in the project exploration part Resolves nvim-tree#1976

alex-courtis requested changes Feb 20, 2023

View reviewed changes

lua/nvim-tree/git/utils.lua Outdated Show resolved Hide resolved

lua/nvim-tree/git/init.lua Outdated Show resolved Hide resolved

lua/nvim-tree/git/utils.lua Outdated Show resolved Hide resolved

Code review

1a78246

- move norm_path to utils.lua - fix comment nvim-tree#2012

alex-courtis reviewed Mar 5, 2023

View reviewed changes

lua/nvim-tree/utils.lua Show resolved Hide resolved

alex-courtis added 2 commits March 5, 2023 13:11

add comments for utils.norm_path

844aed7

get_git_directory use norm_path from utils

d6e10e5

alex-courtis requested changes Mar 5, 2023

View reviewed changes

lua/nvim-tree/git/init.lua Show resolved Hide resolved

lua/nvim-tree/git/init.lua Outdated Show resolved Hide resolved

alex-courtis requested changes Mar 6, 2023

View reviewed changes

watcher improvements

5a83629

alex-courtis added 2 commits April 15, 2023 15:30

Merge branch 'master' into dev/improve-git-dir-handling

fef0988

Merge branch 'master' into dev/improve-git-dir-handling

96b693a

alex-courtis added 3 commits April 18, 2023 11:52

Merge branch 'master' into dev/improve-git-dir-handling

11912ae

Merge branch 'master' into dev/improve-git-dir-handling

b789439

Merge branch 'master' into dev/improve-git-dir-handling

8ad95be

alex-courtis mentioned this pull request Apr 22, 2023

Support for git's worktrees #2142

Closed

alex-courtis approved these changes Apr 22, 2023

View reviewed changes

alex-courtis merged commit 517dee6 into nvim-tree:master Apr 22, 2023

alex-courtis mentioned this pull request Apr 29, 2023

Tree is not reloading after performing actions #2168

Closed

alex-courtis added a commit that referenced this pull request Apr 29, 2023

Revert "fix(#1976): support non-standard $GIT_DIR (#2012)"

1f5bbc1

This reverts commit 517dee6.

dmehala mentioned this pull request May 7, 2023

fix(#2168): Tree not reloading #2194

Closed

alex-courtis mentioned this pull request Jun 11, 2023

feat: support custom $GIT_DIR #2263

Merged

4 tasks

Uh oh!

fix(#1976): improve $GIT_DIR handling #2012

fix(#1976): improve $GIT_DIR handling #2012

Uh oh!

Conversation

dmehala commented Feb 19, 2023

Uh oh!

alex-courtis commented Feb 20, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

setup

master

branch

Uh oh!

alex-courtis left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dmehala commented Feb 26, 2023

Uh oh!

dmehala commented Mar 4, 2023

Uh oh!

alex-courtis commented Mar 5, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

alex-courtis left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

alex-courtis left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

alex-courtis commented Apr 11, 2023

Uh oh!

dmehala commented Apr 12, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

alex-courtis commented Apr 15, 2023

Uh oh!

gegoune commented Apr 15, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

alex-courtis left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

fix(#1976): improve `$GIT_DIR` handling #2012

fix(#1976): improve `$GIT_DIR` handling #2012

alex-courtis commented Feb 20, 2023 •

edited

Loading

alex-courtis left a comment •

edited

Loading

alex-courtis commented Mar 5, 2023 •

edited

Loading

alex-courtis left a comment •

edited

Loading

alex-courtis left a comment •

edited

Loading

dmehala commented Apr 12, 2023 •

edited

Loading

gegoune commented Apr 15, 2023 •

edited

Loading