summaryrefslogtreecommitdiff
path: root/fast-import.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'en/fast-imexport-nested-tags'Junio C Hamano2019-10-151-11/+81
|\
| * fast-import: add support for new 'alias' commandElijah Newren2019-10-041-10/+52
| * fast-import: allow tags to be identified by mark labelsElijah Newren2019-10-041-1/+2
| * fast-import: fix handling of deleted tagsElijah Newren2019-10-041-0/+27
* | fast-import: duplicate into history rather than passing ownershipJeff King2019-08-271-3/+1
* | fast-import: duplicate parsed encoding stringJeff King2019-08-271-2/+5
|/
* Merge branch 'nd/tree-walk-with-repo'Junio C Hamano2019-07-191-3/+6
|\
| * sha1-file.c: remove the_repo from read_object_with_reference()Nguyễn Thái Ngọc Duy2019-06-271-3/+6
* | Merge branch 'rs/copy-array'Junio C Hamano2019-07-091-1/+1
|\ \ | |/ |/|
| * use COPY_ARRAY for copying arraysRené Scharfe2019-06-171-1/+1
* | fast-import: support 'encoding' commit headerElijah Newren2019-05-141-2/+9
|/
* Merge branch 'bc/hash-transition-16'Junio C Hamano2019-04-251-26/+40
|\
| * fast-import: replace sha1_to_hexbrian m. carlson2019-04-011-2/+2
| * fast-import: make hash-size independentbrian m. carlson2019-04-011-16/+29
| * object-store: rename and expand packed_git's sha1 memberbrian m. carlson2019-04-011-8/+9
* | fast-import: fix erroneous handling of get-mark with empty orphan commitsElijah Newren2019-04-011-6/+2
* | fast-import: only allow cat-blob requests where it makes senseElijah Newren2019-04-011-6/+13
* | fast-import: check most prominent commands firstElijah Newren2019-04-011-2/+2
|/
* Merge branch 'en/fast-export-import'Junio C Hamano2019-01-041-154/+12
|\
| * fast-export: add a --show-original-ids option to show original namesElijah Newren2018-11-171-0/+12
| * fast-import: remove unmaintained duplicate documentationElijah Newren2018-11-171-154/+0
* | Upcast size_t variables to uintmax_t when printingTorsten Bögershausen2018-11-121-2/+2
|/
* Merge branch 'jk/cocci'Junio C Hamano2018-09-171-5/+5
|\
| * convert "oidcmp() != 0" to "!oideq()"Jeff King2018-08-291-2/+2
| * convert "oidcmp() == 0" to oideq()Jeff King2018-08-291-3/+3
* | Merge branch 'ds/reachable'Junio C Hamano2018-09-171-0/+1
|\ \
| * | commit.h: remove method declarationsDerrick Stolee2018-07-201-0/+1
* | | treewide: use get_all_packsDerrick Stolee2018-08-201-2/+2
| |/ |/|
* | Merge branch 'sb/object-store-lookup'Junio C Hamano2018-08-021-2/+4
|\ \ | |/
| * commit: add repository argument to lookup_commit_reference_gentlyStefan Beller2018-06-291-2/+4
* | fast-import: do not call diff_delta() with empty bufferMike Hommey2018-07-061-1/+1
|/
* Merge branch 'ma/lockfile-cleanup'Junio C Hamano2018-05-301-1/+1
|\
| * lock_file: make function-local locks non-staticMartin Ågren2018-05-101-1/+1
* | Merge branch 'sb/oid-object-info'Junio C Hamano2018-05-231-6/+10
|\ \
| * | packfile: add repository argument to unpack_entryStefan Beller2018-04-261-1/+1
| * | cache.h: add repository argument to oid_object_infoStefan Beller2018-04-261-5/+9
* | | Merge branch 'ds/commit-graph'Junio C Hamano2018-05-081-1/+1
|\ \ \
| * | | csum-file: rename hashclose() to finalize_hashfile()Derrick Stolee2018-04-021-1/+1
* | | | Merge branch 'jm/mem-pool'Junio C Hamano2018-04-251-61/+16
|\ \ \ \ | |_|/ / |/| | |
| * | | mem-pool: move reusable parts of memory pool into its own fileJameson Miller2018-04-121-69/+1
| * | | fast-import: introduce mem_pool typeJameson Miller2018-04-121-29/+52
| * | | fast-import: rename mem_pool type to mp_blockJameson Miller2018-04-121-10/+10
| | |/ | |/|
* | | Merge branch 'sb/packfiles-in-repository'Junio C Hamano2018-04-111-2/+1
|\ \ \
| * | | packfile: keep prepare_packed_git() privatesb/packfiles-in-repositoryNguyễn Thái Ngọc Duy2018-03-261-1/+0
| * | | packfile: add repository argument to prepare_packed_gitStefan Beller2018-03-261-1/+1
| * | | packfile: allow install_packed_git to handle arbitrary repositoriesStefan Beller2018-03-261-1/+1
* | | | Merge branch 'sb/object-store'Junio C Hamano2018-04-111-2/+6
|\ \ \ \ | |/ / /
| * | | object-store: move packed_git and packed_git_mru to object storeStefan Beller2018-03-261-2/+6
* | | | Merge branch 'bc/object-id'Junio C Hamano2018-04-101-15/+16
|\ \ \ \ | |_|/ / |/| | |
| * | | sha1_file: convert read_sha1_file to struct object_idbrian m. carlson2018-03-141-3/+3
View Lorry Controller Status