On Mon, Sep 20, 2021 at 11:39 AM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > David Aguilar <davvid@xxxxxxxxx> writes: > > > This patch series fixes a regression in difftool that can lead to data loss. > > The symlink-file writing in difftool's dir-diff mode has been fixed to no > > longer write-through to the symlink targets. > > v4 with no backreference? Do you have a message-id for the previous > three rounds handy? <20210919015729.98323-4-davvid@xxxxxxxxx> v1 was dead on arrival so v2 was really the first. There was no v3 -- a different patch in the series went to v3 so I bumped the entire series to v4. > > Please consider patching older Git versions with the fix from 1/3. > > meaing 1/3 would be done on top of maint (v2.33.0), and the other > two can be on a separate branch that starts on a commit that is a > merge of the 1/3's branch into 'master'? > > Thanks. Thanks. Patch 3/3 seems trivially correct so I won't resend that either. Ævar had notes about 2/3 which can be split off to a separate topic, so that's the only one I'll plan to resend all by itself --in-reply-to that thread. I see that it's already in "seen". I can send a replacement patch shortly if that's not too much trouble; dropping "strbuf" from the subject line in the commit message and the note about the test would be good to cleanup. The strbuf leaks will be addressed in the replacement patch. -- David
