diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-10-04 14:21:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-10-04 14:21:43 -0700 |
| commit | 2ab53b59efcd6688ae176db054a938b835258abf (patch) | |
| tree | 576e39adf93d3ea6edb082732011559cf672b6ac /builtin | |
| parent | Merge branch 'ak/doc-typofix' (diff) | |
| parent | fsmonitor OSX: fix hangs for submodules (diff) | |
| download | git-2ab53b59efcd6688ae176db054a938b835258abf.tar.gz git-2ab53b59efcd6688ae176db054a938b835258abf.zip | |
Merge branch 'kn/osx-fsmonitor-with-submodules-fix'
macOS with fsmonitor daemon can hang forever when a submodule is
involved, which has been corrected.
* kn/osx-fsmonitor-with-submodules-fix:
fsmonitor OSX: fix hangs for submodules
Diffstat (limited to '')
| -rw-r--r-- | builtin/fsmonitor--daemon.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/fsmonitor--daemon.c b/builtin/fsmonitor--daemon.c index dce8a3b248..e1e6b96d09 100644 --- a/builtin/fsmonitor--daemon.c +++ b/builtin/fsmonitor--daemon.c @@ -1314,6 +1314,7 @@ static int fsmonitor_run_daemon(void) strbuf_reset(&state.path_gitdir_watch); strbuf_addstr(&state.path_gitdir_watch, absolute_path(repo_get_git_dir(the_repository))); + strbuf_strip_suffix(&state.path_gitdir_watch, "/."); state.nr_paths_watching = 2; } |