From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff King Subject: [PATCH 3/4] cat-file: restore ambiguity warning flag in batch_objects Date: Tue, 7 Jan 2014 17:10:51 -0500 Message-ID: <20140107221051.GC10161@sigill.intra.peff.net> References: <20140107220856.GA10074@sigill.intra.peff.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Cc: Brodie Rao , git@vger.kernel.org, =?utf-8?B?Tmd1eeG7hW4gVGjDoWkgTmfhu41j?= Duy To: Junio C Hamano X-From: git-owner@vger.kernel.org Tue Jan 07 23:10:59 2014 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 1W0erS-0006h6-Fn for gcvg-git-2@plane.gmane.org; Tue, 07 Jan 2014 23:10:58 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754359AbaAGWKy (ORCPT ); Tue, 7 Jan 2014 17:10:54 -0500 Received: from cloud.peff.net ([50.56.180.127]:56764 "HELO peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1754154AbaAGWKx (ORCPT ); Tue, 7 Jan 2014 17:10:53 -0500 Received: (qmail 27875 invoked by uid 102); 7 Jan 2014 22:10:53 -0000 Received: from c-71-63-4-13.hsd1.va.comcast.net (HELO sigill.intra.peff.net) (71.63.4.13) (smtp-auth username relayok, mechanism cram-md5) by peff.net (qpsmtpd/0.84) with ESMTPA; Tue, 07 Jan 2014 16:10:53 -0600 Received: by sigill.intra.peff.net (sSMTP sendmail emulation); Tue, 07 Jan 2014 17:10:51 -0500 Content-Disposition: inline In-Reply-To: <20140107220856.GA10074@sigill.intra.peff.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Since commit 25fba78, we turn off the object/refname ambiguity warning using a global flag. However, we never restore it. This doesn't really matter in the current code, since the program generally exits immediately after the function is done, but it's good code hygeine to clean up after ourselves. Signed-off-by: Jeff King --- builtin/cat-file.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/builtin/cat-file.c b/builtin/cat-file.c index ce79103..c64e287 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -264,6 +264,7 @@ static int batch_objects(struct batch_options *opt) struct strbuf buf = STRBUF_INIT; struct expand_data data; int retval = 0; + int save_warning = warn_on_object_refname_ambiguity; if (!opt->format) opt->format = "%(objectname) %(objecttype) %(objectsize)"; @@ -314,6 +315,7 @@ static int batch_objects(struct batch_options *opt) break; } + warn_on_object_refname_ambiguity = save_warning; strbuf_release(&buf); return retval; } -- 1.8.5.2.500.g8060133