From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff King Subject: Re: [PATCH 05/13] move git_default_* variables to ident.c Date: Mon, 21 May 2012 02:41:18 -0400 Message-ID: <20120521064117.GA21472@sigill.intra.peff.net> References: <20120518230528.GA30510@sigill.intra.peff.net> <20120518231113.GE30031@sigill.intra.peff.net> <7vsjeu89dd.fsf@alter.siamese.dyndns.org> <20120521054118.GA2077@sigill.intra.peff.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Cc: Angus Hammond , git@vger.kernel.org To: Junio C Hamano X-From: git-owner@vger.kernel.org Mon May 21 08:41:45 2012 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SWMJG-0007da-09 for gcvg-git-2@plane.gmane.org; Mon, 21 May 2012 08:41:38 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754656Ab2EUGl1 (ORCPT ); Mon, 21 May 2012 02:41:27 -0400 Received: from 99-108-226-0.lightspeed.iplsin.sbcglobal.net ([99.108.226.0]:50633 "EHLO peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751467Ab2EUGlU (ORCPT ); Mon, 21 May 2012 02:41:20 -0400 Received: (qmail 31199 invoked by uid 107); 21 May 2012 06:41:44 -0000 Received: from sigill.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.7) (smtp-auth username relayok, mechanism cram-md5) by peff.net (qpsmtpd/0.84) with ESMTPA; Mon, 21 May 2012 02:41:44 -0400 Received: by sigill.intra.peff.net (sSMTP sendmail emulation); Mon, 21 May 2012 02:41:18 -0400 Content-Disposition: inline In-Reply-To: <20120521054118.GA2077@sigill.intra.peff.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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