From 939ad4a432f58d2a301db9bae1cf4143bfd659ea Mon Sep 17 00:00:00 2001 From: Savely Krasovsky Date: Sat, 15 Jul 2023 17:31:05 +0300 Subject: storage: filesystem/dotgit, add support for tmp_objdir prefix --- storage/filesystem/dotgit/dotgit.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'storage/filesystem/dotgit/dotgit.go') diff --git a/storage/filesystem/dotgit/dotgit.go b/storage/filesystem/dotgit/dotgit.go index 19d7026..e02e6dd 100644 --- a/storage/filesystem/dotgit/dotgit.go +++ b/storage/filesystem/dotgit/dotgit.go @@ -582,7 +582,9 @@ func (d *DotGit) hasIncomingObjects() bool { directoryContents, err := d.fs.ReadDir(objectsPath) if err == nil { for _, file := range directoryContents { - if strings.HasPrefix(file.Name(), "incoming-") && file.IsDir() { + if file.IsDir() && (strings.HasPrefix(file.Name(), "tmp_objdir-incoming-") || + // Before Git 2.35 incoming commits directory had another prefix + strings.HasPrefix(file.Name(), "incoming-")) { d.incomingDirName = file.Name() } } -- cgit