On Mon, May 21, 2012 at 01:41:18AM -0400, Jeff King wrote: > > > -#define MAX_GITNAME (1000) > > > -extern char git_default_email[MAX_GITNAME]; > > > -extern char git_default_name[MAX_GITNAME]; > > > #define IDENT_NAME_GIVEN 01 > > > #define IDENT_MAIL_GIVEN 02 > > > #define IDENT_ALL_GIVEN (IDENT_NAME_GIVEN|IDENT_MAIL_GIVEN) > > > > During this step, builtin/fmt-merge-msg.c ceases to compile, even though > > in the end it is fixed... > > Hrm. I ran the series through "make" on each commit before submitting, > and it compiled fine. I just did it again to double-check, and it's > still fine. > > What was the error you got? Are you sure you had 03/13 in place > beforehand, which removes the use of MAX_GITNAME from > builtin/fmt-merge-msg.c? Ah, yeah. I just looked at what you wrote in the "What's Cooking" message. For some reason you applied patch 03/13 out of order (in slot 5). I'm not sure how you order the messages in a series when you apply it, but AFAICT, the numbers in the subjects and the date stamps are in the right order. Operator error? :) -Peff -- 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