Hi Paul, On 2015-05-07 18:55, Paul Tan wrote: > Hi Dscho, > > On Fri, May 8, 2015 at 12:26 AM, Johannes Schindelin > <johannes.schindelin@xxxxxx> wrote: >> Both this patch and 9/12 change `git pull` invocations to equivalent non-pull ones, but I wonder whether it would not be a better idea to leave them as-are, so that we can make sure that scripts out there that might use similar `git pull` invocations would be unaffected by the rewrite? > > In the current state[1], I'm aiming for the git-pull rewrite patch > series to break all git-pull tests in the first patch, and then > subsequently make them pass again in later smaller patches by > implementing back the old features. This will make reviewing the code > much easier, as opposed to dumping a huge patch every single re-roll > ;-). > > For both patches and test suites, if the "setup" tests fail, the whole > test suite fails. Given that the test suites are about testing the > diff formatting options and submodules update implementation, which is > mostly irrelevant to git-pull, I think it would be better if the test > suite was not affected by the rewrite, especially since it only > requires changing one line. Ah, that makes sense. I just failed to understand what you were telling me. Maybe it would be better to make that patch a part of the builtin pull instead, so that we do not forget to revert it with the commit that introduces support for `-s ours` in builtin pull? Ciao, Dscho -- 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