From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff King Subject: Re: [PATCH] rerere: exit silently on "forget" when rerere is disabled Date: Thu, 14 May 2015 16:22:07 -0400 Message-ID: <20150514202207.GA13541@peff.net> References: <20150514191637.GA9329@peff.net> <20150514192052.GB9329@peff.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Cc: Alex Coppens , git@vger.kernel.org To: Junio C Hamano X-From: git-owner@vger.kernel.org Thu May 14 22:22:18 2015 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 1Ysze5-0000vI-Ef for gcvg-git-2@plane.gmane.org; Thu, 14 May 2015 22:22:17 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161038AbbENUWM (ORCPT ); Thu, 14 May 2015 16:22:12 -0400 Received: from cloud.peff.net ([50.56.180.127]:58799 "HELO cloud.peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S964879AbbENUWL (ORCPT ); Thu, 14 May 2015 16:22:11 -0400 Received: (qmail 24209 invoked by uid 102); 14 May 2015 20:22:11 -0000 Received: from Unknown (HELO peff.net) (10.0.1.1) by cloud.peff.net (qpsmtpd/0.84) with SMTP; Thu, 14 May 2015 15:22:11 -0500 Received: (qmail 27309 invoked by uid 107); 14 May 2015 20:22:09 -0000 Received: from sigill.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.7) by peff.net (qpsmtpd/0.84) with SMTP; Thu, 14 May 2015 16:22:09 -0400 Received: by sigill.intra.peff.net (sSMTP sendmail emulation); Thu, 14 May 2015 16:22:07 -0400 Content-Disposition: inline In-Reply-To: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Thu, May 14, 2015 at 12:33:02PM -0700, Junio C Hamano wrote: > Jeff King writes: > > > On Thu, May 14, 2015 at 12:19:25PM -0700, Junio C Hamano wrote: > > > >> > It looks like we need to pay more attention to the return value of > >> > setup_rerere, which is what is supposed to take the lock. > >> > >> Good spotting. The normal rerere does check, but rerere-forget > >> codepath seems to forget it. > > > > Here's a patch. > > Thanks. This is obviously correct to fix your "init -q" one. > > I am still puzzled by the original, though. I assumed that rerere > was enabled and working correctly (in the sense that it correctly > replayed a mistaken resolution recorded earlier, which Alex wanted > to correct by forgetting). Yeah, agreed. I don't see any other code paths that could end up trying to commit a lock we haven't taken, though. Alex, can you tell us more about your repository? And possibly show us the output of: ls -d .git/rr-cache git config rerere.enabled in the repository? -Peff