summaryrefslogtreecommitdiff
path: root/unpack-trees.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pc/uninteresting-submodule-disappear-upon-switch-branches'Junio C Hamano2010-01-181-2/+10
|\
| * Remove empty directories when checking out a commit with fewer submodulesPeter Collingbourne2010-01-111-2/+10
* | Merge branch 'cc/reset-more'Junio C Hamano2010-01-131-7/+14
|\ \
| * | "reset --merge": fix unmerged caseJunio C Hamano2010-01-031-7/+14
| |/
* | Merge branch 'nd/sparse'Junio C Hamano2010-01-131-18/+163
|\ \ | |/ |/|
| * ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALIDNguyễn Thái Ngọc Duy2009-12-141-3/+3
| * sparse checkout: inhibit empty worktreeNguyễn Thái Ngọc Duy2009-08-231-0/+7
| * unpack-trees(): ignore worktree check outside checkout areaNguyễn Thái Ngọc Duy2009-08-231-0/+12
| * unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final indexNguyễn Thái Ngọc Duy2009-08-231-1/+81
| * unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkoutNguyễn Thái Ngọc Duy2009-08-231-6/+30
| * unpack-trees.c: generalize verify_* functionsNguyễn Thái Ngọc Duy2009-08-231-5/+18
| * unpack-trees(): add CE_WT_REMOVE to remove on worktree aloneNguyễn Thái Ngọc Duy2009-08-231-1/+8
| * unpack-trees(): carry skip-worktree bit over in merged_entry()Nguyễn Thái Ngọc Duy2009-08-231-0/+2
| * Teach Git to respect skip-worktree bit (writing part)Nguyễn Thái Ngọc Duy2009-08-231-2/+2
* | Merge branch 'jc/fix-tree-walk' (early part)Junio C Hamano2009-11-201-13/+13
|\ \
| * | unpack_callback(): use unpack_failed() consistentlyJunio C Hamano2009-10-111-12/+12
| * | unpack-trees: typofixJunio C Hamano2009-10-111-1/+1
| |/
* | Use 'fast-forward' all over the placeFelipe Contreras2009-10-241-1/+1
|/
* Merge branch 'maint'Junio C Hamano2009-07-181-1/+1
|\
| * checkout -f: deal with a D/F conflict entry correctlyJunio C Hamano2009-07-181-1/+1
* | Fix extraneous lstat's in 'git checkout -f'Linus Torvalds2009-07-141-1/+1
* | unpack-trees.c: work around run-time array initialization flaw on IRIX 6.5Brandon Casey2009-07-101-1/+1
* | Simplify read_directory[_recursive]() argumentsLinus Torvalds2009-07-091-1/+1
* | Fix various sparse warnings in the git source codeLinus Torvalds2009-06-201-1/+1
* | Optimize "diff-index --cached" using cache-treeJunio C Hamano2009-05-251-0/+17
|/
* replace direct calls to unlink(2) with unlink_or_warnAlex Riesen2009-04-291-1/+1
* unpack-trees: do not muck with attributes when we are not checking outJunio C Hamano2009-04-171-2/+4
* Merge branch 'jc/attributes-checkout'Junio C Hamano2009-03-261-0/+3
|\
| * Read attributes from the index that is being checked outJunio C Hamano2009-03-131-0/+3
* | Merge branch 'jc/maint-1.6.0-read-tree-overlay'Junio C Hamano2009-03-171-3/+3
|\ \
| * | read-tree A B C: do not create a bogus index and do not segfaultJunio C Hamano2009-03-121-3/+3
* | | Record ns-timestamps if possible, but do not use it without USE_NSECKjetil Barvik2009-03-071-2/+0
* | | verify_uptodate(): add ce_uptodate(ce) testKjetil Barvik2009-02-191-1/+1
* | | make USE_NSEC work as expectedKjetil Barvik2009-02-191-2/+6
* | | check_updates(): effective removal of cache entries marked CE_REMOVEKjetil Barvik2009-02-181-3/+1
* | | unlink_entry(): introduce schedule_dir_for_removal()Kjetil Barvik2009-02-091-24/+6
* | | lstat_cache(): swap func(length, string) into func(string, length)Kjetil Barvik2009-02-091-2/+2
| |/ |/|
* | Merge branch 'maint'Junio C Hamano2009-01-311-3/+6
|\ \
| * \ Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-01-311-3/+6
| |\ \
| | * | merge: fix out-of-bounds memory accessRené Scharfe2009-01-311-3/+6
| * | | Merge branch 'cb/maint-unpack-trees-absense' into maintJunio C Hamano2009-01-231-18/+16
| |\ \ \ | | |/ / | |/| |
* | | | Merge branch 'kb/lstat-cache'Junio C Hamano2009-01-251-2/+2
|\ \ \ \
| * | | | lstat_cache(): introduce has_symlink_or_noent_leading_path() functionKjetil Barvik2009-01-181-2/+2
| |/ / /
* | | | Merge branch 'cb/maint-unpack-trees-absense'Junio C Hamano2009-01-131-18/+16
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | unpack-trees: remove redundant path search in verify_absentClemens Buchacher2009-01-051-6/+2
| * | unpack-trees: fix path search bug in verify_absentClemens Buchacher2009-01-051-10/+10
| * | unpack-trees: handle failure in verify_absentClemens Buchacher2009-01-051-3/+5
| |/
* | Fix non-literal format in printf-style callsDaniel Lowe2008-11-111-1/+1
* | correct cache_entry allocationJeff King2008-11-011-1/+1
* | checkout: do not lose staged removalJunio C Hamano2008-09-091-1/+10
View Lorry Controller Status