summaryrefslogtreecommitdiff
path: root/cache.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...Junio C Hamano2017-12-221-0/+9
|\
| * move index_has_changes() from builtin/am.c to merge.c for reuseElijah Newren2017-12-221-0/+9
* | Merge branch 'ls/editor-waiting-message'Junio C Hamano2017-12-191-0/+1
|\ \
| * | refactor "dumb" terminal determinationLars Schneider2017-12-041-0/+1
| |/
* | Merge branch 'ar/unconfuse-three-dots'Junio C Hamano2017-12-191-0/+6
|\ \
| * | print_sha1_ellipsis: introduce helperAnn T Ropea2017-12-041-0/+6
* | | Merge branch 'bc/hash-algo'Junio C Hamano2017-12-131-4/+8
|\ \ \
| * | | Switch empty tree and blob lookups to use hash abstractionbrian m. carlson2017-11-131-4/+4
| * | | Integrate hash algorithm support with repo setupbrian m. carlson2017-11-131-0/+4
* | | | Merge branch 'bw/protocol-v1'Junio C Hamano2017-12-061-0/+10
|\ \ \ \
| * | | | http: tell server that the client understands v1Brandon Williams2017-10-171-0/+2
| * | | | protocol: introduce protocol extension mechanismsBrandon Williams2017-10-171-0/+8
* | | | | Merge branch 'tb/add-renormalize'Junio C Hamano2017-11-271-0/+1
|\ \ \ \ \
| * | | | | add: introduce "--renormalize"tb/add-renormalizeTorsten Bögershausen2017-11-171-0/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'av/fsmonitor'Junio C Hamano2017-11-211-0/+1
|\ \ \ \ \
| * | | | | fsmonitor: delay updating state until after split index is mergedAlex Vandiver2017-11-011-0/+1
* | | | | | Merge branch 'bp/fsmonitor'Junio C Hamano2017-11-211-2/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | fsmonitor: teach git to optionally utilize a file system monitor to speed up ...Ben Peart2017-10-011-2/+8
* | | | | | Merge branch 'bp/read-index-from-skip-verification'Junio C Hamano2017-11-151-0/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | read_index_from(): speed index loading by skipping verification of the entry ...bp/read-index-from-skip-verificationBen Peart2017-11-081-0/+1
* | | | | | Merge branch 'rs/hex-to-bytes-cleanup'Junio C Hamano2017-11-091-0/+7
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | notes: move hex_to_bytes() to hex.c and export itRené Scharfe2017-11-011-0/+7
| | |_|/ / | |/| | |
* | | | | Merge branch 'ma/lockfile-fixes'Junio C Hamano2017-11-061-1/+24
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | read_cache: roll back lock in `update_index_if_able()`ma/lockfile-fixesMartin Ågren2017-10-071-0/+4
| * | | | read-cache: leave lock in right state in `write_locked_index()`Martin Ågren2017-10-071-0/+4
| * | | | read-cache: drop explicit `CLOSE_LOCK`-flagMartin Ågren2017-10-071-3/+2
| * | | | cache.h: document `write_locked_index()`Martin Ågren2017-10-061-0/+16
* | | | | Merge branch 'jk/no-optional-locks'Junio C Hamano2017-10-031-0/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | git: add --no-optional-locks optionJeff King2017-09-271-0/+6
* | | | | Merge branch 'rj/no-sign-compare'Junio C Hamano2017-09-291-2/+2
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | |
| * | | cache.h: hex2chr() - avoid -Wsign-compare warningsRamsay Jones2017-09-221-2/+2
| |/ /
| * | Merge branch 'sb/sha1-file-cleanup' into maintJunio C Hamano2017-09-101-1/+0
| |\ \
| * \ \ Merge branch 'jk/hashcmp-memcmp' into maintJunio C Hamano2017-09-101-8/+1
| |\ \ \
| * \ \ \ Merge branch 'jt/subprocess-handshake' into maintJunio C Hamano2017-08-231-0/+3
| |\ \ \ \
| | * \ \ \ Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshakeJunio C Hamano2017-07-261-0/+3
| | |\ \ \ \
* | | | | | | pack: make packed_git_mru global a value instead of a pointerJonathan Nieder2017-09-141-2/+2
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'jt/packmigrate'Junio C Hamano2017-08-261-121/+1
|\ \ \ \ \ \
| * | | | | | pack: move for_each_packed_object()Jonathan Tan2017-08-231-6/+1
| * | | | | | pack: move has_pack_index()Jonathan Tan2017-08-231-2/+0
| * | | | | | pack: move has_sha1_pack()Jonathan Tan2017-08-231-2/+0
| * | | | | | pack: move find_sha1_pack()Jonathan Tan2017-08-231-3/+0
| * | | | | | pack: move find_pack_entry_one(), is_pack_valid()Jonathan Tan2017-08-231-8/+0
| * | | | | | pack: move check_pack_index_ptr(), nth_packed_object_offset()Jonathan Tan2017-08-231-16/+0
| * | | | | | pack: move nth_packed_object_{sha1,oid}Jonathan Tan2017-08-231-14/+0
| * | | | | | pack: move clear_delta_base_cache(), packed_object_info(), unpack_entry()Jonathan Tan2017-08-231-7/+0
| * | | | | | pack: move unpack_object_header()Jonathan Tan2017-08-231-1/+0
| * | | | | | pack: move get_size_from_delta()Jonathan Tan2017-08-231-1/+0
| * | | | | | pack: move unpack_object_header_buffer()Jonathan Tan2017-08-231-1/+0
| * | | | | | pack: move {,re}prepare_packed_git and approximate_object_countJonathan Tan2017-08-231-15/+0
| * | | | | | pack: move install_packed_git()Jonathan Tan2017-08-231-1/+0