mirror of
https://github.com/sourcegit-scm/sourcegit
synced 2025-05-21 04:04:59 +00:00
code_review: PR #1103
Since we only use `$GIT_COMMON_DIR` in filesystem watcher, it is unnecessary to store this value in `Repository`, and we can query the `$GIT_COMMON_DIR` only when it looks like a worktree Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
parent
cea8a90680
commit
b4ab4afd3a
4 changed files with 16 additions and 17 deletions
|
@ -45,10 +45,19 @@ namespace SourceGit.ViewModels
|
|||
set => SetProperty(ref _gitDir, value);
|
||||
}
|
||||
|
||||
public string GitCommonDir
|
||||
public string GitDirForWatcher
|
||||
{
|
||||
get => _gitCommonDir;
|
||||
set => SetProperty(ref _gitCommonDir, value);
|
||||
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
|
||||
|
@ -435,12 +444,11 @@ namespace SourceGit.ViewModels
|
|||
set;
|
||||
} = 0;
|
||||
|
||||
public Repository(bool isBare, string path, string gitDir, string gitCommonDir)
|
||||
public Repository(bool isBare, string path, string gitDir)
|
||||
{
|
||||
IsBare = isBare;
|
||||
FullPath = path;
|
||||
GitDir = gitDir;
|
||||
GitCommonDir = gitCommonDir;
|
||||
}
|
||||
|
||||
public void Open()
|
||||
|
@ -2444,7 +2452,6 @@ namespace SourceGit.ViewModels
|
|||
|
||||
private string _fullpath = string.Empty;
|
||||
private string _gitDir = string.Empty;
|
||||
private string _gitCommonDir = string.Empty;
|
||||
private Models.RepositorySettings _settings = null;
|
||||
private Models.FilterMode _historiesFilterMode = Models.FilterMode.None;
|
||||
private bool _hasAllowedSignersFile = false;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue