From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: [PATCH] Make the 'lock file exists' error more informative Date: Wed, 04 Mar 2009 09:55:12 -0800 Message-ID: <7veixd5g1r.fsf@gitster.siamese.dyndns.org> References: <1236179277-12477-1-git-send-email-johnflux@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: John Tapsell , git@vger.kernel.org To: Matthieu Moy X-From: git-owner@vger.kernel.org Wed Mar 04 18:57:28 2009 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1LevL5-0004Pw-80 for gcvg-git-2@gmane.org; Wed, 04 Mar 2009 18:57:03 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753335AbZCDRz2 (ORCPT ); Wed, 4 Mar 2009 12:55:28 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753438AbZCDRz1 (ORCPT ); Wed, 4 Mar 2009 12:55:27 -0500 Received: from a-sasl-fastnet.sasl.smtp.pobox.com ([207.106.133.19]:55136 "EHLO sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753323AbZCDRz1 (ORCPT ); Wed, 4 Mar 2009 12:55:27 -0500 Received: from localhost.localdomain (unknown [127.0.0.1]) by a-sasl-fastnet.sasl.smtp.pobox.com (Postfix) with ESMTP id 03E319FDEC; Wed, 4 Mar 2009 12:55:19 -0500 (EST) Received: from pobox.com (unknown [68.225.240.211]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by a-sasl-fastnet.sasl.smtp.pobox.com (Postfix) with ESMTPSA id 9ED7E9FDEA; Wed, 4 Mar 2009 12:55:14 -0500 (EST) In-Reply-To: (Matthieu Moy's message of "Wed, 04 Mar 2009 16:54:49 +0100") User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux) X-Pobox-Relay-ID: 9FD75A88-08E5-11DE-A393-CFA5EBB1AA3C-77302942!a-sasl-fastnet.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Matthieu Moy writes: > John Tapsell writes: > >> It looks like someone did 90% of the work, then forgot to actually use >> the function > > someone = me ;-). > > The message is a bit inacurrate: the function is already used in two > places, I just didn't notice this one. > >> - if (errno == EEXIST) { >> + if (err == EEXIST) { > > Oops, right. > >> - die("unable to create '%s.lock': %s", path, strerror(errno)); >> + unable_to_lock_index_die(path, errno); > > Actually, _this_ instance is still to be fixed in next. You probably > looked at the other one that my original message fixes. Not in 'next', but in the maintenance track of v1.6.2.X and merged upwards, as v1.6.2~11^2~2 (More friendly message when locking the index fails., 2009-02-19) is obviously in v1.6.2 just released. John, congratulations for fixing the first bug immediately after a big release. Please make it a habit to sign off your patches.