mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/warn-on-object-refname-ambiguity'

Browse Source 
* jk/warn-on-object-refname-ambiguity:
  rev-list: disable object/refname ambiguity check with --stdin
  cat-file: restore warn_on_object_refname_ambiguity flag
  cat-file: fix a minor memory leak in batch_objects
  cat-file: refactor error handling of batch_objects
This commit is contained in:
Junio C Hamano
2014-03-25 11:07:36 -07:00
parent ec8cd4fc11 4c30d50402
commit d4c6e9fb6f
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
builtin/cat-file.c
View File

@ -269,6 +269,8 @@ static int batch_objects(struct batch_options *opt)
{ {
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
struct expand_data data; struct expand_data data;
int save_warning;
int retval = 0;
if (!opt->format) if (!opt->format)
opt->format = "%(objectname) %(objecttype) %(objectsize)"; opt->format = "%(objectname) %(objecttype) %(objectsize)";
@ -297,11 +299,10 @@ static int batch_objects(struct batch_options *opt)
* warn) ends up dwarfing the actual cost of the object lookups * warn) ends up dwarfing the actual cost of the object lookups
* themselves. We can work around it by just turning off the warning. * 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; warn_on_object_refname_ambiguity = 0;
while (strbuf_getline(&buf, stdin, '\n') != EOF) { while (strbuf_getline(&buf, stdin, '\n') != EOF) {
int error;
if (data.split_on_whitespace) { if (data.split_on_whitespace) {
/* /*
* Split at first whitespace, tying off the beginning * Split at first whitespace, tying off the beginning
@ -316,12 +317,14 @@ static int batch_objects(struct batch_options *opt)
data.rest = p; data.rest = p;
} }
error = batch_one_object(buf.buf, opt, &data); retval = batch_one_object(buf.buf, opt, &data);
if (error) if (retval)
return error; break;
} }
return 0; strbuf_release(&buf);
warn_on_object_refname_ambiguity = save_warning;
return retval;
} }
static const char * const cat_file_usage[] = { static const char * const cat_file_usage[] = {

6
revision.c
View File

@ -1575,6 +1575,10 @@ static void read_revisions_from_stdin(struct rev_info *revs,
{ {
struct strbuf sb; struct strbuf sb;
int seen_dashdash = 0; int seen_dashdash = 0;
int save_warning;
save_warning = warn_on_object_refname_ambiguity;
warn_on_object_refname_ambiguity = 0;
strbuf_init(&sb, 1000); strbuf_init(&sb, 1000);
while (strbuf_getwholeline(&sb, stdin, '\n') != EOF) { while (strbuf_getwholeline(&sb, stdin, '\n') != EOF) {
@ -1596,7 +1600,9 @@ static void read_revisions_from_stdin(struct rev_info *revs,
} }
if (seen_dashdash) if (seen_dashdash)
read_pathspec_from_stdin(revs, &sb, prune); read_pathspec_from_stdin(revs, &sb, prune);
strbuf_release(&sb); strbuf_release(&sb);
warn_on_object_refname_ambiguity = save_warning;
} }
static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what) static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)