On Sat Aug 8, 2020 at 4:48 AM EDT, Martin Ågren wrote: > Describing the current state of affairs and using imperative mode, it > could be something like: > > When creating "new file" diffs against i-t-a index entries, diff-lib > erroneously uses the mode of the cache entry rather than the mode of > the file in the worktree. Change run_diff_files() to correctly use the > mode of the worktree file in this case. I see both styles around in the tree (past for the state of the world before this patch, present for the state of the world as of this patch, vs. present for the state of the world just before and just after applying this patch). Neither is unreadable to me so I just want to do whatever's the standard around here. (I'm not convinced, as a matter of grammar, that the commit-message-present verb form is really in the imperative mood; I think the freeform nature of English grammar obscures that it's the present active infinitive, analogous to, say, the fact that a French software program with an "open file" button will say "ouvrir" and not "ouvrez".) > I can confirm that the bug is there before your patch and that your > patch fixes it. Could you add a test in this patch so we can trust that > this stays fixed? The whole set of i-t-a diffing behaviors needs a test suite (unless I've grepped very poorly), which will come in another patchset. t4140 in this thread's main patchset assumes they work.