On 01/24/2014 11:51 AM, Jonathan Nieder wrote: > a quick summary of the symptoms and when it came up?
You're suggested commit message correctly explains it: > Do you mean something like the following? > > Sometimes when working with a large repository it can be useful to > try out a merge and only check out conflicting files to disk (for > example as a speed optimization on a server). Until v1.7.7-rc1~28^2~20 > (merge-recursive: When we detect we can skip an update, actually > skip it, 2011-08-11), it was possible to do so with the following > idiom: > > ... summary of commands here ... > > Nowadays, that still works and the exit status is the same, > but merge-recursive produces a diagnostic if "our" side renamed > a file: > > error: addinfo_cache failed for path 'dst' > > Add a test to document this regression. Yes, thanks. > Elsewhere in the test, commands in a subshell are indented by another > tab, so these new tests should probably follow suit. Great. I'll fold both of the above into the next revision of the series. Thanks, -Brad -- 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
