Skip to content

Commit a42fcd1

Browse files
peffgitster
authored andcommitted
cat-file: restore warn_on_object_refname_ambiguity flag
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>
1 parent 648027c commit a42fcd1

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

builtin/cat-file.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,7 @@ static int batch_objects(struct batch_options *opt)
260260
{
261261
struct strbuf buf = STRBUF_INIT;
262262
struct expand_data data;
263+
int save_warning;
263264
int retval = 0;
264265

265266
if (!opt->format)
@@ -282,6 +283,7 @@ static int batch_objects(struct batch_options *opt)
282283
* warn) ends up dwarfing the actual cost of the object lookups
283284
* themselves. We can work around it by just turning off the warning.
284285
*/
286+
save_warning = warn_on_object_refname_ambiguity;
285287
warn_on_object_refname_ambiguity = 0;
286288

287289
while (strbuf_getline(&buf, stdin, '\n') != EOF) {
@@ -305,6 +307,7 @@ static int batch_objects(struct batch_options *opt)
305307
}
306308

307309
strbuf_release(&buf);
310+
warn_on_object_refname_ambiguity = save_warning;
308311
return retval;
309312
}
310313

0 commit comments

Comments
 (0)