summaryrefslogtreecommitdiff
path: root/unpack-trees.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ma/unpack-trees-free-msgs'Junio C Hamano2018-05-301-3/+14
|\
| * unpack_trees_options: free messages when doneMartin Ågren2018-05-221-3/+14
* | Merge branch 'bc/object-id'Junio C Hamano2018-05-301-1/+1
|\ \
| * | Update struct index_state to use struct object_idbrian m. carlson2018-05-021-1/+1
* | | Merge branch 'js/use-bug-macro'Junio C Hamano2018-05-301-1/+1
|\ \ \
| * | | Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin2018-05-061-1/+1
| |/ /
* | | Merge branch 'en/unpack-trees-split-index-fix'Junio C Hamano2018-05-231-4/+15
|\ \ \
| * | | unpack_trees: fix breakage when o->src_index != o->dst_indexElijah Newren2018-05-021-4/+15
* | | | Merge branch 'en/rename-directory-detection-reboot'Junio C Hamano2018-05-231-2/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | merge-recursive: fix overwriting dirty files involved in renamesElijah Newren2018-05-081-2/+2
| | |/ | |/|
* | | Merge branch 'sb/submodule-move-nested'Junio C Hamano2018-05-081-1/+1
|\ \ \ | |/ / |/| |
| * | submodule-config: allow submodule_free to handle arbitrary repositoriesStefan Beller2018-03-291-1/+1
* | | Revert "Merge branch 'en/rename-directory-detection'"Junio C Hamano2018-04-111-2/+2
* | | Merge branch 'en/rename-directory-detection'Junio C Hamano2018-04-101-2/+2
|\ \ \ | |_|/ |/| |
| * | merge-recursive: fix overwriting dirty files involved in renamesElijah Newren2018-02-271-2/+2
* | | Merge branch 'jh/partial-clone'Junio C Hamano2018-03-291-0/+1
|\ \ \
| * | | unpack-trees: release oid_array after use in check_updates()René Scharfe2018-03-251-0/+1
* | | | Merge branch 'bw/c-plus-plus'Junio C Hamano2018-03-061-3/+3
|\ \ \ \
| * | | | unpack-trees: rename 'new' variablesBrandon Williams2018-02-221-3/+3
* | | | | Merge branch 'nd/fix-untracked-cache-invalidation'Junio C Hamano2018-02-271-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | dir.c: ignore paths containing .git when invalidating untracked cachend/fix-untracked-cache-invalidationNguyễn Thái Ngọc Duy2018-02-071-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'jh/partial-clone'Junio C Hamano2018-02-131-0/+22
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | unpack-trees: batch fetching of missing blobsJonathan Tan2017-12-081-0/+22
* | | unpack-trees: oneway_merge to update submodulesStefan Beller2018-01-051-0/+3
| |/ |/|
* | Merge branch 'bp/fsmonitor'Junio C Hamano2017-11-211-0/+2
|\ \
| * | fsmonitor: teach git to optionally utilize a file system monitor to speed up ...Ben Peart2017-10-011-0/+2
| |/
* | refs: convert resolve_gitlink_ref to struct object_idbrian m. carlson2017-10-161-1/+1
* | Convert remaining callers of resolve_gitlink_ref to object_idbrian m. carlson2017-10-161-4/+4
|/
* Merge branch 'ls/convert-filter-progress'Junio C Hamano2017-09-101-1/+1
|\
| * convert: display progress for filtered objects that have been delayedls/convert-filter-progressLars Schneider2017-08-241-1/+1
* | Merge branch 'ma/up-to-date'Junio C Hamano2017-09-101-1/+1
|\ \
| * | treewide: correct several "up-to-date" to "up to date"ma/up-to-dateMartin Ågren2017-08-231-1/+1
* | | Merge branch 'bw/submodule-config-cleanup'Junio C Hamano2017-08-261-46/+35
|\ \ \ | |_|/ |/| |
| * | unpack-trees: improve loading of .gitmodulesBrandon Williams2017-08-031-16/+27
| * | unpack-trees: don't respect submodule.updateBrandon Williams2017-08-031-30/+8
* | | Merge branch 'jc/simplify-progress'Junio C Hamano2017-08-241-2/+1
|\ \ \
| * | | progress: simplify "delayed" progress APIjc/simplify-progressJunio C Hamano2017-08-191-2/+1
| | |/ | |/|
* | | Merge branch 'rs/object-id'Junio C Hamano2017-08-241-3/+3
|\ \ \
| * | | tree-walk: convert fill_tree_descriptor() to object_idrs/object-idRené Scharfe2017-08-141-3/+3
* | | | Merge branch 'bw/grep-recurse-submodules'Junio C Hamano2017-08-221-1/+1
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | cache.h: add GITMODULES_FILE macroBrandon Williams2017-08-021-1/+1
| |/
* | Merge branch 'ls/filter-process-delayed'Junio C Hamano2017-08-111-0/+2
|\ \ | |/ |/|
| * convert: add "status=delayed" to filter process protocolLars Schneider2017-06-301-0/+2
* | Merge branch 'bw/config-h'Junio C Hamano2017-06-241-0/+1
|\ \ | |/ |/|
| * config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
* | Merge branch 'dt/unpack-save-untracked-cache-extension'Junio C Hamano2017-05-301-0/+1
|\ \
| * | unpack-trees: preserve index extensionsdt/unpack-save-untracked-cache-extensionDavid Turner2017-05-201-0/+1
| |/
* | Merge branch 'bw/dir-c-stops-relying-on-the-index'Junio C Hamano2017-05-291-5/+5
|\ \
| * | dir: convert read_directory to take an indexBrandon Williams2017-05-061-1/+1
| * | dir: convert is_excluded to take an indexBrandon Williams2017-05-061-1/+1
View Lorry Controller Status