[PATCH 1/2] cat-file: restore warn_on_object_refname_ambiguity flag
- From
Jeff King <peff@peff.net>
- Date
- Mar 12, 2014, 20:05 UTC
- Message-ID
- <20140312200542.GA3506@sigill.intra.peff.net>
- 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