On Sat, May 30, 2015 at 3:29 PM, Paul Tan <pyokagan@xxxxxxxxx> wrote: > Hi, > Okay, I'm trying this out in the next re-roll. I do agree that this > patch series should not touch anything in t/ at all. > > One problem(?) is that putting builtins/pull.o in the BUILTIN_OBJS and > leaving git-pull.sh in SCRIPT_SH in the Makefile will generate 2 > targets to ./git-pull (they will clobber each other). For GNU Make, > the last defined target will win, so in this case it just happens that > git-pull.sh will win because the build targets for the shell scripts > are defined after the build targets for the builtins, so this works in > our favor I guess. > > Regards, > Paul Just to add on, I just discovered that test-lib.sh unsets all GIT_* environment variables "for repeatability", so the name "GIT_USE_BUILTIN_PULL" cannot be used. I'm tempted to just add a underscore just before the name ("_GIT_USE_BUILTIN_PULL") to work around this, since it's just a temporary thing. Thanks, Paul -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html