Do I guess right that this if-statement is the where the real fix is? All the other modifications in this file are cleanups/refactorings/style nits, right? At least all youre new tests succeed if I only add add a test for a dirty-worktree file in case of a checkout from theirs.