On Mon, Jun 23, 2014 at 5:21 PM, Eric Sunshine <sunsh...@sunshineco.com> wrote: > On Thu, Jun 19, 2014 at 5:28 PM, Jeff King <p...@peff.net> wrote: >> This is shorter, harder to get wrong, and more clearly >> captures the intent. >> >> Signed-off-by: Jeff King <p...@peff.net> >> --- >> I wondered if there was a reason to avoid this (because we are in >> setup_git_env, which can potentially be called by git_pathdup). But the >> git_graft_file initialization below already uses it, and I >> double-checked that it is safe once git_dir is set. > > This patch will conflict textually with patch 6/28 of Duy's > nd/multiple-work-trees series [1].
I'll just steal the conflicted bit about git_object_dir and put in the re-roll. It's a better way anyway. If git_index_file change still results in conflicts, Junio can resolve it easily (I don't touch it in nd/multiple-work-trees). -- Duy -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
