On Wed, Jul 8, 2015 at 2:52 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Paul Tan <pyokagan@xxxxxxxxx> writes: >> This patch series rewrites git-am.sh into optimized C builtin/am.c, and is >> part of my GSoC project to rewrite git-pull and git-am into C builtins[1]. >> >> [1] https://gist.github.com/pyokagan/1b7b0d1f4dab6ba3cef1 > > Is it really a rewrite into "optimized C", or just "C"? I suspect > it is the latter. Well, "optimized" in comparison to the shell script ;-) We don't replicate the shell script in its entirety, but optimize the code where it is obvious and sensible. It's not the "most optimized" (and I will gladly accept any suggestions where there are obvious optimizations to be made), but I do consider it an improvement in terms of efficiency, while keeping the overall structure of the code close to the shell script for easy review. I'll remove the word though, because it's true that the main purpose of this patch series is to "make it work" first. > This seems to apply cleanly to 'master' but fails to compile, as it > depends on some new stuff that are not even in 'next' yet, e.g. > argv_array_pushv() that is from pt/pull-builtin, and it does not > apply cleanly on top of that branch, either. I tried applying the series, and yeah it conflicts with 1570856 (config.c: avoid xmmap error messages, 2015-05-28) because the pt/pull-builtin branch in pu is based on an old version of master. That's the only conflict though, it applies cleanly otherwise. > I'll see what's the cleanest way to queue this would be. Perhaps > merge pt/builtin-pull on a copy of 'master' and then apply these, or > something like that. Thanks. Regards, 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