Repeated Indexing Outputs/Resolving Deltas output when pulling after upgrading to 2.40.1.vfs.0.2

[AtOMiCNebula]

• [X] I was not able to find an open or closed issue matching what I'm seeing, including in the git-for-windows/git tracker.

Setup

• Which version of microsoft/git are you using? Is it 32-bit or 64-bit?

git version 2.40.1.vfs.0.2
cpu: x86_64
built from commit: 59bc9667c84164a4ad879d9b424687ca631f01b3
sizeof-long: 4
sizeof-size_t: 8
shell-path: /bin/sh
feature: fsmonitor--daemon

Are you using Scalar or VFS for Git?

Scalar

• Which version of Windows are you running? Vista, 7, 8, 10? Is it 32-bit or 64-bit?

Microsoft Windows [Version 10.0.19045.3086]
64-bit

• Any other interesting things about your environment that might be related to the issue you're seeing?

These operations were performed in an administrative CMD prompt, though this hasn't been a problem in the past.

Details

• Which terminal/shell are you running Git from? e.g Bash/CMD/PowerShell/other

CMD

• What commands did you run to trigger this issue? If you can provide a Minimal, Complete, and Verifiable example this will help us understand the issue.

git pull

• What did you expect to occur after running these commands?

A single round of "Indexing objects" and "Resolving deltas" output, followed by the rest of the fetch and pull process.

• What actually happened instead?

The first pull took a bit longer than expected, and bounced between "Indexing objects" and "Resolving deltas" many times. Second pull was as expected.

(Despite the date on the prefetch being last week, this output was generated ~15 minutes ago. It's likely that this date is around the time I pulled last week though, Monday morning routines and whatnot 😄)

z:\og1\src>git pull
Prefetch 1686589283 (2023-06-12 17:01:23 +0000) (bytes received): 143024902, done.
Indexing objects: 100% (36693/36693), done.
Resolving deltas: 100% (23425/23425), done.
Indexing objects: 100% (54109/54109), done.
Resolving deltas: 100% (29450/29450), done.
Indexing objects: 100% (102788/102788), done.
Resolving deltas: 100% (68503/68503), done.
Indexing objects: 100% (35611/35611), done.
Resolving deltas: 100% (22965/22965), done.
Indexing objects: 100% (8623/8623), done.
Resolving deltas: 100% (5465/5465), done.
Indexing objects: 100% (12566/12566), done.
Resolving deltas: 100% (8385/8385), done.
Indexing objects: 100% (400/400), done.
Resolving deltas: 100% (222/222), done.
Indexing objects: 100% (332/332), done.
Resolving deltas: 100% (194/194), done.
Indexing objects: 100% (446/446), done.
Resolving deltas: 100% (189/189), done.
Indexing objects: 100% (1010/1010), done.
Resolving deltas: 100% (423/423), done.
Indexing objects: 100% (544/544), done.
Resolving deltas: 100% (168/168), done.
Indexing objects: 100% (975/975), done.
Resolving deltas: 100% (629/629), done.
Indexing objects: 100% (912/912), done.
Resolving deltas: 100% (418/418), done.
Indexing objects: 100% (911/911), done.
Resolving deltas: 100% (458/458), done.
Indexing objects: 100% (1883/1883), done.
Resolving deltas: 100% (1012/1012), done.
Indexing objects: 100% (1454/1454), done.
Resolving deltas: 100% (625/625), done.
Indexing objects: 100% (1479/1479), done.
Resolving deltas: 100% (893/893), done.
Indexing objects: 100% (1208/1208), done.
Resolving deltas: 100% (690/690), done.
Indexing objects: 100% (906/906), done.
Resolving deltas: 100% (487/487), done.
Indexing objects: 100% (614/614), done.
Resolving deltas: 100% (256/256), done.
Indexing objects: 100% (1323/1323), done.
Resolving deltas: 100% (784/784), done.
Indexing objects: 100% (1432/1432), done.
Resolving deltas: 100% (819/819), done.
Indexing objects: 100% (5396/5396), done.
Resolving deltas: 100% (2685/2685), done.
From https://dev.azure.com/office/Office/_git/Office
 - [deleted]                     (none)     -> [...]

• If the problem was occurring with a specific repository, can you specify the repository?

  • [ ] Public repo: insert URL here
  • [ ] Windows monorepo
  • [X] Office monorepo
  • [ ] Other Microsoft-internal repo: insert name here
  • [ ] Other internal repo.

[dscho]

Out of curiosity: what does git config --show-origin core.fscache say?

[AtOMiCNebula]

Wow, I could have sworn I replied to this last week, but...maybe I only imagined it. Sorry for the slow reply... 😓

z:\og1\src>git config --show-origin core.fscache
file:.git/config        true

z:\og1\src>

[dscho]

@AtOMiCNebula could you temporarily disable FSCache via git config core.fscache false and then see whether the repeated indexing persists?

[AtOMiCNebula]

Back from vacation, sorry for another slow reply! It does not appear to have changed things, unfortunately. I started a pull just now, forgot about this thread, came back to it, hit CTRL+C right after a "Resolving Deltas" statement finished, disabled fscache, started the pull again, and it's still doing the back-and-forth. ☹️

I'm not sure if the prefetch dates being different (despite running it seconds apart from each other) is a red herring or not. Perhaps something going wrong with packfile acquisition or processing? I saw #571 happen a release or two ago, but...well, I await your next suggestion for me to try. 😅

z:\og1\src>git pull
Prefetch 1687802512 (2023-06-26 18:01:52 +0000) (bytes received): 268466399, done.
Indexing objects: 100% (37412/37412), done.
Resolving deltas: 100% (24173/24173), done.
Indexing objects: 100% (34770/34770), done.
Resolving deltas: 100% (22625/22625), done.
Indexing objects: 100% (40653/40653), done.
Resolving deltas: 100% (26404/26404), done.
Indexing objects: 100% (43338/43338), done.
Resolving deltas: 100% (27919/27919), done.

z:\og1\src>git config core.fscache false

z:\og1\src>git pull
Prefetch 1688083375 (2023-06-30 00:02:55 +0000) (bytes received): 178633918, done.
Indexing objects: 100% (38669/38669), done.
Resolving deltas: 100% (24728/24728), done.
Indexing objects: 100% (10047/10047), done.
Resolving deltas: 100% (6535/6535), done.
Indexing objects: 100% (6339/6339), done.
Resolving deltas: 100% (3902/3902), done.
Indexing objects: 100% (22542/22542), done.
Resolving deltas: 100% (13683/13683), done.
Indexing objects: 100% (20681/20681), done.
Resolving deltas: 100% (12570/12570), done.
Indexing objects: 100% (88454/88454), done.
Resolving deltas: 100% (41704/41704), done.
Indexing objects: 100% (42224/42224), done.
Resolving deltas: 100% (26674/26674), done.
Indexing objects: 100% (39575/39575), done.
Resolving deltas: 100% (24939/24939), done.
Indexing objects: 100% (14973/14973), done.
Resolving deltas: 100% (7893/7893), done.
Indexing objects: 100% (15502/15502), done.
Resolving deltas: 100% (9769/9769), done.
Indexing objects: 100% (125/125), done.
Resolving deltas: 100% (63/63), done.
Indexing objects: 100% (625/625), done.
Resolving deltas: 100% (310/310), done.
Indexing objects: 100% (1083/1083), done.
Resolving deltas: 100% (446/446), done.
Indexing objects: 100% (502/502), done.
Resolving deltas: 100% (133/133), done.
Indexing objects: 100% (793/793), done.
Resolving deltas: 100% (454/454), done.
Indexing objects: 100% (840/840), done.
Resolving deltas: 100% (384/384), done.
Indexing objects: 100% (919/919), done.
Resolving deltas: 100% (431/431), done.
Indexing objects: 100% (797/797), done.
Resolving deltas: 100% (378/378), done.
Indexing objects: 100% (1237/1237), done.
Resolving deltas: 100% (661/661), done.
Indexing objects: 100% (839/839), done.
Resolving deltas: 100% (424/424), done.
Indexing objects: 100% (868/868), done.
Resolving deltas: 100% (362/362), done.
Indexing objects: 100% (850/850), done.
Resolving deltas: 100% (432/432), done.
Indexing objects: 100% (901/901), done.
Resolving deltas: 100% (468/468), done.
Indexing objects: 100% (2251/2251), done.
Resolving deltas: 100% (1539/1539), done.
Indexing objects: 100% (1564/1564), done.
Resolving deltas: 100% (835/835), done.
Indexing objects: 100% (1842/1842), done.
Resolving deltas: 100% (979/979), done.
Indexing objects: 100% (2440/2440), done.
Resolving deltas: 100% (1443/1443), done.
Indexing objects: 100% (3868/3868), done.
Resolving deltas: 100% (2292/2292), done.
Indexing objects: 100% (3297/3297), done.
Resolving deltas: 100% (1887/1887), done.
Indexing objects: 100% (2026/2026), done.
Resolving deltas: 100% (1095/1095), done.
Indexing objects: 100% (3109/3109), done.
Resolving deltas: 100% (1853/1853), done.
Indexing objects: 100% (3150/3150), done.
Resolving deltas: 100% (1875/1875), done.
From https://dev.azure.com/office/Office/_git/Office
[...]

z:\og1\src>