diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-24 19:21:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-24 19:21:21 -0700 |
| commit | 356df9bd8df58eb759fedaee8a8d1a7dc0872f8f (patch) | |
| tree | 3ed41eb0da59c4a6e1b668c3392295ee334f978b /environment.c | |
| parent | 2bf3501150145d1f05678c20ab8e8d66f849851f (diff) | |
| parent | d099b7173dabdeeb1f339151ac2169b3a91bf631 (diff) | |
| download | git-356df9bd8df58eb759fedaee8a8d1a7dc0872f8f.tar.gz | |
Merge branch 'jk/cat-file-batch-optim'
If somebody wants to only know on-disk footprint of an object
without having to know its type or payload size, we can bypass a
lot of code to cheaply learn it.
* jk/cat-file-batch-optim:
Fix some sparse warnings
sha1_object_info_extended: pass object_info to helpers
sha1_object_info_extended: make type calculation optional
packed_object_info: make type lookup optional
packed_object_info: hoist delta type resolution to helper
sha1_loose_object_info: make type lookup optional
sha1_object_info_extended: rename "status" to "type"
cat-file: disable object/refname ambiguity check for batch mode
Diffstat (limited to 'environment.c')
| -rw-r--r-- | environment.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/environment.c b/environment.c index 0cb67b22cf..5398c36dd4 100644 --- a/environment.c +++ b/environment.c @@ -22,6 +22,7 @@ int prefer_symlink_refs; int is_bare_repository_cfg = -1; /* unspecified */ int log_all_ref_updates = -1; /* unspecified */ int warn_ambiguous_refs = 1; +int warn_on_object_refname_ambiguity = 1; int repository_format_version; const char *git_commit_encoding; const char *git_log_output_encoding; |