summaryrefslogtreecommitdiff
path: root/sha1_file.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jl/nor-or-nand-and'Junio C Hamano2014-04-081-2/+2
|\
| * code and test: fix misuses of "nor"jl/nor-or-nand-andJustin Lebar2014-03-311-1/+1
| * comments: fix misuses of "nor"Justin Lebar2014-03-311-1/+1
* | Merge branch 'dd/use-alloc-grow'Junio C Hamano2014-03-181-6/+1
|\ \
| * | sha1_file.c: use ALLOC_GROW() in pretend_sha1_file()dd/use-alloc-growDmitry S. Dolzhenko2014-03-031-6/+1
| |/
* | Merge branch 'nd/sha1-file-delta-stack-leakage-fix'Junio C Hamano2014-03-181-0/+4
|\ \
| * | sha1_file: fix delta_stack memory leak in unpack_entrynd/sha1-file-delta-stack-leakage-fixNguyễn Thái Ngọc Duy2014-02-241-0/+4
* | | Merge branch 'mh/object-code-cleanup'Junio C Hamano2014-03-141-30/+36
|\ \ \
| * | | sha1_file.c: document a bunch of functions defined in the filemh/object-code-cleanupMichael Haggerty2014-02-241-11/+15
| * | | sha1_file_name(): declare to return a const stringMichael Haggerty2014-02-241-15/+9
| * | | find_pack_entry(): document last_found_packMichael Haggerty2014-02-241-4/+12
| | |/ | |/|
* | | Merge branch 'jk/pack-bitmap'Junio C Hamano2014-02-271-4/+2
|\ \ \ | |/ / |/| |
| * | do not discard revindex when re-preparing packfilesJeff King2014-01-161-1/+0
| * | count-objects: recognize .bitmap in garbage-checkingNguyễn Thái Ngọc Duy2013-12-301-0/+1
| * | sha1_file: export `git_open_noatime`Vicent Marti2013-10-241-3/+1
* | | Merge branch 'ss/safe-create-leading-dir-with-slash'Junio C Hamano2014-01-271-4/+8
|\ \ \
| * | | safe_create_leading_directories(): on Windows, \ can separate path componentsss/safe-create-leading-dir-with-slashMichael Haggerty2014-01-221-4/+8
* | | | Merge branch 'mh/safe-create-leading-directories'Junio C Hamano2014-01-271-29/+38
|\ \ \ \ | |/ / /
| * | | safe_create_leading_directories(): add new error value SCLD_VANISHEDMichael Haggerty2014-01-061-0/+11
| * | | safe_create_leading_directories(): introduce enum for return valuesMichael Haggerty2014-01-061-8/+8
| * | | safe_create_leading_directories(): always restore slash at end of loopMichael Haggerty2014-01-061-13/+9
| * | | safe_create_leading_directories(): split on first of multiple slashesMichael Haggerty2014-01-061-2/+3
| * | | safe_create_leading_directories(): rename local variableMichael Haggerty2014-01-061-5/+5
| * | | safe_create_leading_directories(): add explicit "slash" pointerMichael Haggerty2014-01-061-9/+11
| * | | safe_create_leading_directories(): reduce scope of local variableMichael Haggerty2014-01-061-1/+2
| * | | safe_create_leading_directories(): fix format of "if" chainingMichael Haggerty2014-01-061-4/+2
* | | | 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
|\ \ \ | |/ / |/| |