On Wed, Feb 14, 2018 at 10:51 AM, Elijah Newren <newren@xxxxxxxxx> wrote: > This patchset introduces directory rename detection to merge-recursive. See > https://public-inbox.org/git/20171110190550.27059-1-newren@xxxxxxxxx/ > for the first series (including design considerations, etc.) This series > continues to depend on en/merge-recursive-fixes in next, at least > contextually. For the curious, follow-up series and comments can also be > found at > https://public-inbox.org/git/20171120220209.15111-1-newren@xxxxxxxxx/ > https://public-inbox.org/git/20171121080059.32304-1-newren@xxxxxxxxx/ > https://public-inbox.org/git/20171129014237.32570-1-newren@xxxxxxxxx/ > https://public-inbox.org/git/20171228041352.27880-1-newren@xxxxxxxxx/ > https://public-inbox.org/git/20180105202711.24311-1-newren@xxxxxxxxx/ > https://public-inbox.org/git/20180130232533.25846-1-newren@xxxxxxxxx/ > > Also, as a reminder, this series fixes a few bugs somewhat as a side effect: > * a bug causing dirty files involved in a rename to be overwritten > * a few memory leaks > > Changes since v7 (full tbdiff follows below): > * Added Stefan's Reviewed-by. > * Squashed commits introducing new hash structs and associated functions > into the commit that used them to avoid unused function > warnings/errors. > * Added or clarified a number of comments where things were unclear > * Minor stuff: > * Style (and typo) fixes for commit message and comments > * Avoiding casting with hash initialization function > * s/malloc/xmalloc/ > * struct assignment > * s/20/GIT_MAX_RAWSZ/ Even the interdiff has Stefan's Reviewed-by. Thanks for being persistent, Stefan
