summaryrefslogtreecommitdiff
path: root/unpack-trees.c
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | dir: convert add_excludes to take an indexBrandon Williams2017-05-061-1/+1
| * | dir: convert is_excluded_from_list to take an indexBrandon Williams2017-05-061-2/+2
| |/
* | Merge branch 'sb/reset-recurse-submodules'Junio C Hamano2017-05-291-1/+6
|\ \ | |/ |/|
| * entry.c: submodule recursing: respect force flag correctlyStefan Beller2017-04-181-1/+6
* | Merge branch 'jh/unpack-trees-micro-optim'Junio C Hamano2017-04-231-5/+33
|\ \ | |/ |/|
| * unpack-trees: avoid duplicate ODB lookups during checkoutjh/unpack-trees-micro-optimJeff Hostetler2017-04-151-5/+33
* | unpack-trees.c: align submodule error message to the other error messagessb/unpack-trees-would-lose-submodule-message-updateStefan Beller2017-03-291-1/+1
* | unpack-trees: check if we can perform the operation for submodulesStefan Beller2017-03-161-9/+122
* | unpack-trees: pass old oid to verify_clean_submoduleStefan Beller2017-03-161-7/+10
|/
* Merge branch 'sb/unpack-trees-super-prefix'Junio C Hamano2017-02-031-3/+40
|\
| * unpack-trees: support super-prefix optionsb/unpack-trees-super-prefixStefan Beller2017-01-251-3/+40
* | Merge branch 'sb/unpack-trees-cleanup'Junio C Hamano2017-01-181-23/+30
|\ \ | |/ |/|
View Lorry Controller Status