From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Michael Haggerty <mhagger@alum.mit.edu>, git@vger.kernel.org
Subject: [PATCH 1/2] cat-file: restore warn_on_object_refname_ambiguity flag
Date: Wed, 12 Mar 2014 16:05:43 -0400 [thread overview]
Message-ID: <20140312200542.GA3506@sigill.intra.peff.net> (raw)
In-Reply-To: <20140312200348.GB1816@sigill.intra.peff.net>
Commit 25fba78 turned off the object/refname ambiguity check
during "git cat-file --batch" operations. However, this is a
global flag, so let's restore it when we are done.
This shouldn't make any practical difference, as cat-file
exits immediately afterwards, but is good code hygeine and
would prevent an unnecessary surprise if somebody starts to
call cmd_cat_file later.
Signed-off-by: Jeff King <peff@peff.net>
---
It also matches the restore behavior from the next patch, which adds
similar code to "rev-list --stdin". Which I think makes more sense, as
we often start revision traversals from inside other programs. Though it
is reasonably unlikely to use "--stdin" with such a traversal.
builtin/cat-file.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 1664f5c..7073304 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -269,6 +269,7 @@ static int batch_objects(struct batch_options *opt)
{
struct strbuf buf = STRBUF_INIT;
struct expand_data data;
+ int save_warning;
int retval = 0;
if (!opt->format)
@@ -298,6 +299,7 @@ static int batch_objects(struct batch_options *opt)
* warn) ends up dwarfing the actual cost of the object lookups
* themselves. We can work around it by just turning off the warning.
*/
+ save_warning = warn_on_object_refname_ambiguity;
warn_on_object_refname_ambiguity = 0;
while (strbuf_getline(&buf, stdin, '\n') != EOF) {
@@ -321,6 +323,7 @@ static int batch_objects(struct batch_options *opt)
}
strbuf_release(&buf);
+ warn_on_object_refname_ambiguity = save_warning;
return retval;
}
--
1.9.0.403.g7a2f4b0
next prev parent reply other threads:[~2014-03-12 20:05 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-11 22:12 What's cooking in git.git (Mar 2014, #02; Tue, 11) Junio C Hamano
2014-03-11 23:22 ` Duy Nguyen
2014-03-12 18:31 ` Junio C Hamano
2014-03-12 19:35 ` Jeff King
2014-03-12 19:49 ` Junio C Hamano
2014-03-12 20:03 ` Jeff King
2014-03-12 20:05 ` Jeff King [this message]
2014-03-12 20:06 ` [PATCH 2/2] rev-list: disable object/refname ambiguity check with --stdin Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140312200542.GA3506@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mhagger@alum.mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).