On Sat, Nov 25, 2017 at 4:52 PM, Johannes Schindelin <Johannes.Schindelin@xxxxxx> wrote: > On Tue, 21 Nov 2017, Elijah Newren wrote: > >> diff --git a/merge-recursive.c b/merge-recursive.c <snip> >> + if (old_len != new_len || strncmp(old_path, new_path, old_len)) { >> + *old_dir = strndup(old_path, old_len); >> + *new_dir = strndup(new_path, new_len); > > These two callers of strndup() are the only ones in Git's code base now. > It is also causing a compile error on Windows. > > Any reason you did not use xstrndup() here? > > Ciao, > Dscho Nope, was just unaware. I'll go ahead and switch them over for my next roll of the series. Sorry for the pain.