Merge branch 'jk/warn-on-object-refname-ambiguity'
authorJunio C Hamano <gitster@pobox.com>
Tue, 25 Mar 2014 18:07:36 +0000 (11:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 25 Mar 2014 18:07:36 +0000 (11:07 -0700)
* 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

1  2 
builtin/cat-file.c
revision.c
Simple merge
diff --cc revision.c
Simple merge