Skip to content

Commit

Permalink
cat-file: restore warn_on_object_refname_ambiguity flag
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jeff King authored and Junio C Hamano committed Mar 13, 2014
1 parent 648027c commit a42fcd1
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions builtin/cat-file.c
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,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)
Expand All @@ -282,6 +283,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) {
Expand All @@ -305,6 +307,7 @@ static int batch_objects(struct batch_options *opt)
}

strbuf_release(&buf);
warn_on_object_refname_ambiguity = save_warning;
return retval;
}

Expand Down

0 comments on commit a42fcd1

Please sign in to comment.