summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* stop leaking lock structs in some simple casesjk/incore-lockfile-removalJeff King2017-09-064-37/+18
* ref_lock: stop leaking lock_filesJeff King2017-09-061-23/+16
* lockfile: update lifetime requirements in documentationJeff King2017-09-061-10/+10
* tempfile: auto-allocate tempfiles on heapJeff King2017-09-0613-141/+136
* tempfile: remove deactivated list entriesJeff King2017-09-062-36/+25
* tempfile: use list.h for linked listJeff King2017-09-063-7/+48
* tempfile: release deactivated strbufs instead of resettingJeff King2017-09-061-1/+1
* tempfile: robustify cleanup handlerJeff King2017-09-061-9/+15
* tempfile: factor out deactivationJeff King2017-09-061-7/+11
* tempfile: factor out activationJeff King2017-09-061-8/+10
* tempfile: replace die("BUG") with BUG()Jeff King2017-09-061-10/+10
* tempfile: handle NULL tempfile pointers gracefullyJeff King2017-09-062-6/+8
* tempfile: prefer is_tempfile_active to bare accessJeff King2017-09-061-8/+8
* lockfile: do not rollback lock on failed closeJeff King2017-09-064-26/+22
* tempfile: do not delete tempfile on failed closeJeff King2017-09-067-37/+40
* always check return value of close_tempfileJeff King2017-09-063-6/+6
* verify_signed_buffer: prefer close_tempfile() to close()Jeff King2017-09-061-1/+1
* setup_temporary_shallow: move tempfile struct into functionJeff King2017-09-061-6/+5
* setup_temporary_shallow: avoid using inactive tempfileJeff King2017-09-061-1/+1
* write_index_as_tree: cleanup tempfile on errorJeff King2017-09-061-8/+15
* The sixth batch post 2.14Junio C Hamano2017-09-061-0/+10
* Merge branch 'rs/archive-excluded-directory'Junio C Hamano2017-09-062-11/+85
|\
| * archive: don't queue excluded directoriesRené Scharfe2017-08-192-9/+27
| * archive: factor out helper functions for handling attributesRené Scharfe2017-08-191-8/+23
| * t5001: add tests for export-ignore attributes and exclude pathspecsRené Scharfe2017-08-191-3/+44
* | Merge branch 'po/read-graft-line'Junio C Hamano2017-09-064-23/+29
|\ \
| * | commit: rewrite read_graft_linepo/read-graft-linePatryk Obara2017-08-181-15/+21
| * | commit: allocate array using object_id sizePatryk Obara2017-08-181-1/+2
| * | commit: replace the raw buffer with strbuf in read_graft_linePatryk Obara2017-08-183-14/+13
| * | sha1_file: fix definition of null_sha1Patryk Obara2017-08-171-1/+1
* | | Merge branch 'ks/branch-set-upstream'Junio C Hamano2017-09-065-92/+23
|\ \ \
| * | | branch: quote branch/ref names to improve readabilityks/branch-set-upstreamKaartic Sivaraam2017-08-171-8/+8
| * | | builtin/branch: stop supporting the "--set-upstream" optionKaartic Sivaraam2017-08-174-84/+14
| * | | t3200: cleanup cruft of a testKaartic Sivaraam2017-08-171-0/+1
| |/ /
* | | The fifth batch post 2.14Junio C Hamano2017-08-261-1/+49
* | | Merge branch 'mg/killed-merge'Junio C Hamano2017-08-263-4/+31
|\ \ \
| * | | merge: save merge state earliermg/killed-mergeMichael J Gruber2017-08-232-0/+17
| * | | merge: split write_merge_state in twoMichael J Gruber2017-08-231-3/+8
| * | | merge: clarify call chainMichael J Gruber2017-08-231-0/+2
| * | | Documentation/git-merge: explain --continueMichael J Gruber2017-08-211-1/+4
| | |/ | |/|
* | | Merge branch 'jt/packmigrate'Junio C Hamano2017-08-2637-2014/+2081
|\ \ \
| * | | pack: move for_each_packed_object()Jonathan Tan2017-08-236-46/+54
| * | | pack: move has_pack_index()Jonathan Tan2017-08-234-10/+10
| * | | pack: move has_sha1_pack()Jonathan Tan2017-08-237-8/+11
| * | | pack: move find_pack_entry() and make it globalJonathan Tan2017-08-233-53/+55
| * | | pack: move find_sha1_pack()Jonathan Tan2017-08-236-16/+18
| * | | pack: move find_pack_entry_one(), is_pack_valid()Jonathan Tan2017-08-234-84/+82
| * | | pack: move check_pack_index_ptr(), nth_packed_object_offset()Jonathan Tan2017-08-234-49/+49
| * | | pack: move nth_packed_object_{sha1,oid}Jonathan Tan2017-08-234-46/+46
| * | | pack: move clear_delta_base_cache(), packed_object_info(), unpack_entry()Jonathan Tan2017-08-234-670/+685