summaryrefslogtreecommitdiff
path: root/sha1_file.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bw/c-plus-plus' into ds/lazy-load-treesJunio C Hamano2018-04-111-14/+14
|\
| * object: rename function 'typename' to 'type_name'Brandon Williams2018-02-141-10/+10
| * object_info: change member name from 'typename' to 'type_name'Brandon Williams2018-02-141-5/+5
* | Merge branch 'bc/hash-algo'Junio C Hamano2018-02-151-31/+29
|\ \
| * | sha1_file: switch uses of SHA-1 to the_hash_algobrian m. carlson2018-02-021-26/+26
| * | hash: create union for hash context allocationbrian m. carlson2018-02-021-11/+9
| |/
* | Merge branch 'po/object-id'Junio C Hamano2018-02-151-47/+53
|\ \
| * | sha1_file: rename hash_sha1_file_literallypo/object-idPatryk Obara2018-01-301-2/+3
| * | sha1_file: convert write_loose_object to object_idPatryk Obara2018-01-301-12/+16
| * | sha1_file: convert force_object_loose to object_idPatryk Obara2018-01-301-5/+5
| * | sha1_file: convert write_sha1_file to object_idPatryk Obara2018-01-301-14/+15
| * | sha1_file: convert hash_sha1_file to object_idPatryk Obara2018-01-301-13/+13
| * | sha1_file: convert pretend_sha1_file to object_idPatryk Obara2018-01-301-5/+5
| |/
* | Merge branch 'cc/sha1-file-name'Junio C Hamano2018-02-131-14/+26
|\ \
| * | sha1_file: improve sha1_file_name() perfscc/sha1-file-nameChristian Couder2018-01-191-2/+2
| * | sha1_file: remove static strbuf from sha1_file_name()Christian Couder2018-01-171-13/+25
| * | Merge branch 'jk/info-alternates-fix' into maintJunio C Hamano2017-11-211-1/+3
| |\ \
* | \ \ Merge branch 'tb/crlf-conv-flags'Junio C Hamano2018-02-131-6/+6
|\ \ \ \
| * | | | convert_to_git(): safe_crlf/checksafe becomes int conv_flagstb/crlf-conv-flagsTorsten Bögershausen2018-01-161-6/+6
| | |_|/ | |/| |
* | | | Merge branch 'gs/retire-mru'Junio C Hamano2018-02-131-1/+0
|\ \ \ \
| * | | | mru: Replace mru.[ch] with list.h implementationgs/retire-mruGargi Sharma2018-01-241-1/+0
* | | | | Merge branch 'jh/fsck-promisors'Junio C Hamano2018-02-131-8/+24
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | sha1_file: support lazily fetching missing objectsJonathan Tan2017-12-081-8/+24
| | |/ / | |/| |
* | | | Merge branch 'ds/for-each-file-in-obj-micro-optim'Junio C Hamano2017-12-131-5/+7
|\ \ \ \
| * | | | sha1_file: use strbuf_add() instead of strbuf_addf()ds/for-each-file-in-obj-micro-optimDerrick Stolee2017-12-041-5/+7
* | | | | Merge branch 'bc/hash-algo'Junio C Hamano2017-12-131-0/+58
|\ \ \ \ \
| * | | | | Add structure representing hash algorithmbrian m. carlson2017-11-131-0/+58
* | | | | | Merge branch 'jk/fewer-pack-rescan'Junio C Hamano2017-12-061-0/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | sha1_file: fast-path null sha1 as a missing objectjk/fewer-pack-rescanJeff King2017-11-221-0/+3
| * | | | | Merge branch 'jk/info-alternates-fix' into maintJunio C Hamano2017-10-231-20/+11
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/write-in-full-fix' into maintJunio C Hamano2017-10-231-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/sha1-loose-object-info-fix' into maintJunio C Hamano2017-10-181-2/+6
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/drop-sha1-entry-pos' into maintJunio C Hamano2017-10-181-11/+0
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'tb/add-renormalize'Junio C Hamano2017-11-271-2/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add: introduce "--renormalize"tb/add-renormalizeTorsten Bögershausen2017-11-171-2/+14
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/info-alternates-fix'Junio C Hamano2017-11-151-1/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | link_alt_odb_entries: make empty input a noopjk/info-alternates-fixJeff King2017-11-131-1/+3
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'rs/hex-to-bytes-cleanup'Junio C Hamano2017-11-091-13/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | sha1_file: use hex_to_bytes()rs/hex-to-bytes-cleanupRené Scharfe2017-11-011-13/+11
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'bc/object-id'Junio C Hamano2017-11-061-16/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | refs: convert resolve_gitlink_ref to struct object_idbrian m. carlson2017-10-161-1/+1
| * | | | | | | | sha1_file: convert index_path and index_fd to struct object_idbrian m. carlson2017-10-161-15/+15
| |/ / / / / / /
* | | | | | | | Merge branch 'ma/lockfile-fixes'Junio C Hamano2017-11-061-11/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | sha1_file: do not leak `lock_file`Martin Ågren2017-10-061-11/+8
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'jk/sha1-loose-object-info-fix'Junio C Hamano2017-10-111-2/+6
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | sha1_loose_object_info: handle errors from unpack_sha1_restjk/sha1-loose-object-info-fixJeff King2017-10-061-2/+6
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jk/read-in-full'Junio C Hamano2017-10-031-3/+8
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | avoid looking at errno for short read_in_full() returnsJeff King2017-09-271-3/+8
* | | | | | Merge branch 'jk/info-alternates-fix'Junio C Hamano2017-09-251-20/+11
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | read_info_alternates: warn on non-trivial errorsJeff King2017-09-201-0/+1