github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-30 22:01:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: pass dirs to watcher directly

Browse Source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo
2025-03-17 16:29:56 +08:00
parent b4ab4afd3a
commit 7031693489
3 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/ViewModels/Repository.cs
View File

@@ -45,21 +45,6 @@ namespace SourceGit.ViewModels
set => SetProperty(ref _gitDir, value);
}
public string GitDirForWatcher
{
get
{
// Only try to get `$GIT_COMMON_DIR` if this repository looks like a worktree.
if (_gitDir.Replace("\\", "/").IndexOf(".git/worktrees/", StringComparison.Ordinal) > 0)
{
var commonDir = new Commands.QueryGitCommonDir(_fullpath).Result();
return string.IsNullOrEmpty(commonDir) ? _gitDir : commonDir;
}
return _gitDir;
}
}
public Models.RepositorySettings Settings
{
get => _settings;
@@ -472,7 +457,16 @@ namespace SourceGit.ViewModels
try
{
_watcher = new Models.Watcher(this);
// For worktrees, we need to watch the $GIT_COMMON_DIR instead of the $GIT_DIR.
var gitDirForWatcher = _gitDir;
if (_gitDir.Replace("\\", "/").IndexOf(".git/worktrees/", StringComparison.Ordinal) > 0)
{
var commonDir = new Commands.QueryGitCommonDir(_fullpath).Result();
if (!string.IsNullOrEmpty(commonDir))
gitDirForWatcher = commonDir;
}
_watcher = new Models.Watcher(this, _fullpath, gitDirForWatcher);
}
catch (Exception ex)
{