On Thu, May 16, 2013 at 1:35 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > The series fails to apply (on top of the hotfix for 1.8.3 you sent > earlier today) at this point. It wants to remove the code added by > the hotfix but I do not see a corresponding check for listable, > which may make sense, as the log message says, when the user > specified a list of branches: > > If the user specified a list of branches, we ignore what the remote > repository lists, and simply use the branches directly. Since some > remotes don't report the branches correctly, this is useful. > > but it is unclear if the listable code needs to go somewhere else > when the user didn't. > > I'll stop at 6/8 for now, as this is not urgent before the 1.8.3 > release. I can send the conflict fix, or I can send a v2 of the 47-something patches. I already have a few fixes on top that might make sense to squash. Up to you. -- Felipe Contreras -- 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