summaryrefslogtreecommitdiff
path: root/sha1_file.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/oi-delta-base'Junio C Hamano2014-01-101-0/+53
|\
| * sha1_object_info_extended: provide delta base sha1sJeff King2013-12-261-0/+53
* | Merge branch 'jh/rlimit-nofile-fallback'Junio C Hamano2014-01-101-7/+30
|\ \
| * | get_max_fd_limit(): fall back to OPEN_MAX upon getrlimit/sysconf failurejh/rlimit-nofile-fallbackJunio C Hamano2013-12-181-7/+30
| * | Merge branch 'jh/loose-object-dirs-creation-race' into maintJunio C Hamano2013-12-171-1/+3
| |\ \
| * \ \ Merge branch 'sb/sha1-loose-object-info-check-existence' into maintJunio C Hamano2013-12-171-6/+9
| |\ \ \
* | \ \ \ Merge branch 'cc/replace-object-info'Junio C Hamano2014-01-101-10/+10
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | sha1_file: perform object replacement in sha1_object_info_extended()Christian Couder2013-12-121-6/+7
| * | | | sha1_object_info_extended(): add an "unsigned flags" parameterChristian Couder2013-12-121-3/+3
| * | | | sha1_file.c: add lookup_replace_object_extended() to pass flagsChristian Couder2013-12-121-2/+1
| * | | | rename READ_SHA1_FILE_REPLACE flag to LOOKUP_REPLACE_OBJECTChristian Couder2013-12-121-1/+1
| |/ / /
* | | | Merge branch 'jk/remove-experimental-loose-object-support'Junio C Hamano2013-12-061-74/+0
|\ \ \ \
| * | | | drop support for "experimental" loose objectsjk/remove-experimental-loose-object-supportJeff King2013-11-211-74/+0
* | | | | Merge branch 'sb/sha1-loose-object-info-check-existence'Junio C Hamano2013-12-051-6/+9
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | sha1_loose_object_info(): do not return success on missing objectsb/sha1-loose-object-info-check-existenceJunio C Hamano2013-11-061-6/+9
| |/ / /
* | | | Merge branch 'jh/loose-object-dirs-creation-race'Junio C Hamano2013-12-051-1/+3
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | sha1_file.c:create_tmpfile(): Fix race when creating loose object dirsjh/loose-object-dirs-creation-raceJohan Herland2013-10-281-1/+3
* | | Sync with v1.8.4.2Junio C Hamano2013-10-281-1/+1
|\ \ \ | | |/ | |/|
| * | sha1_file: move comment about return value where it belongsChristian Couder2013-10-281-1/+1
| |/
* | Merge branch 'nd/unpack-entry-optim-in-pack-objects'Jonathan Nieder2013-09-241-10/+10
|\ \
| * | pack-objects: no crc check when the cached version is usednd/unpack-entry-optim-in-pack-objectsNguyễn Thái Ngọc Duy2013-09-131-10/+10
* | | Merge branch 'jk/has-sha1-file-retry-packed'Junio C Hamano2013-09-171-1/+4
|\ \ \ | | |/ | |/|
| * | has_sha1_file: re-check pack directory before giving upjk/has-sha1-file-retry-packedJeff King2013-08-301-1/+4
| |/
* | Merge branch 'bc/unuse-packfile'Junio C Hamano2013-09-041-15/+85
|\ \ | |/ |/|
| * Don't close pack fd when free'ing pack windowsbc/unuse-packfileBrandon Casey2013-08-021-14/+7
| * sha1_file: introduce close_one_pack() to close packs on fd pressureBrandon Casey2013-08-021-1/+78
* | Merge branch 'jk/cat-file-batch-optim'Junio C Hamano2013-07-241-60/+119
|\ \
| * | Fix some sparse warningsRamsay Jones2013-07-181-1/+1
| * | sha1_object_info_extended: pass object_info to helpersJeff King2013-07-121-27/+22
| * | sha1_object_info_extended: make type calculation optionalJeff King2013-07-121-7/+13
| * | packed_object_info: make type lookup optionalJeff King2013-07-121-9/+16
| * | packed_object_info: hoist delta type resolution to helperJeff King2013-07-121-40/+53
| * | sha1_loose_object_info: make type lookup optionalJeff King2013-07-121-5/+43
| * | sha1_object_info_extended: rename "status" to "type"Jeff King2013-07-121-10/+10
* | | Merge branch 'jk/in-pack-size-measurement'Junio C Hamano2013-07-181-5/+17
|\ \ \ | |/ /
| * | teach sha1_object_info_extended a "disk_size" queryJeff King2013-07-071-4/+16
| * | zero-initialize object_info structsJeff King2013-07-071-1/+1
* | | Merge branch 'jk/unpack-entry-fallback-to-another'Junio C Hamano2013-06-231-1/+10
|\ \ \
| * | | unpack_entry: do not die when we fail to apply a deltaJeff King2013-06-141-1/+10
* | | | Merge branch 'nd/traces'Junio C Hamano2013-06-201-2/+12
|\ \ \ \
| * | | | core: use env variable instead of config var to turn on logging pack accessNguyễn Thái Ngọc Duy2013-06-091-2/+12
| | |/ / | |/| |
* | | | Merge branch 'tr/sha1-file-silence-loose-object-info-under-prune-race'Junio C Hamano2013-06-111-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | sha1_file: silence sha1_loose_object_infoThomas Rast2013-06-031-1/+1
| | |/ | |/|
* | | sha1_file: trivial style cleanupFelipe Contreras2013-06-031-1/+1
| |/ |/|
* | Merge branch 'tr/unpack-entry-use-after-free-fix'Junio C Hamano2013-05-031-1/+0
|\ \
| * | unpack_entry: avoid freeing objects in base cacheThomas Rast2013-04-301-1/+0
* | | Merge branch 'tr/packed-object-info-wo-recursion'Junio C Hamano2013-04-181-145/+266
|\ \ \ | |/ /
| * | sha1_file: remove recursion in unpack_entryThomas Rast2013-03-271-81/+150
| * | Refactor parts of in_delta_base_cache/cache_or_unpack_entryThomas Rast2013-03-271-13/+32
| * | sha1_file: remove recursion in packed_object_infoThomas Rast2013-03-251-51/+84
| |/