summaryrefslogtreecommitdiff
path: root/unpack-trees.c
Commit message (Expand)AuthorAgeFilesLines
* checkout -f: deal with a D/F conflict entry correctlyJunio C Hamano2009-07-181-1/+1
* 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
* | unpack_trees(): protect the handcrafted in-core index from read_cache()Junio C Hamano2008-08-231-0/+1
|/
* unpack_trees(): allow callers to differentiate worktree errors from merge errorsJunio C Hamano2008-05-291-3/+7
* unpack-trees: allow Porcelain to give different error messagesJunio C Hamano2008-05-191-14/+41
* Optimize symlink/directory detectionLinus Torvalds2008-05-101-7/+5
* Make unpack-tree update removed files before any updated filesLinus Torvalds2008-04-091-2/+7
* Make branch merging aware of underlying case-insensitive filsystemsLinus Torvalds2008-04-091-0/+26
* Make hash_name_lookup able to do case-independent lookupsLinus Torvalds2008-04-091-1/+1
* Make "index_name_exists()" return the cache_entry it foundLinus Torvalds2008-04-091-4/+4
* Fix read-tree not to discard errorsJunio C Hamano2008-03-181-3/+6
* Don't update unchanged merge entriesLinus Torvalds2008-03-161-3/+6
* Fix recent 'unpack_trees()'-related changes breaking 'git stash'Linus Torvalds2008-03-141-0/+2
* read-tree() and unpack_trees(): use consistent limitJunio C Hamano2008-03-131-3/+3
* unpack_trees(): fix diff-index regression.Linus Torvalds2008-03-101-2/+0
* traverse_trees_recursive(): propagate merge errors upJunio C Hamano2008-03-101-3/+4
* unpack_trees(): minor memory leak fix in unused destination indexLinus Torvalds2008-03-091-0/+1
* Make 'unpack_trees()' have a separate source and destination indexLinus Torvalds2008-03-091-77/+72
* Make 'unpack_trees()' take the index to work on as an argumentLinus Torvalds2008-03-091-39/+40
* Move 'unpack_trees()' over to 'traverse_trees()' interfaceLinus Torvalds2008-03-091-281/+249
* Merge branch 'db/checkout'Junio C Hamano2008-02-271-56/+98
|\
| * Add "skip_unmerged" option to unpack_trees.Daniel Barkalow2008-02-091-3/+17
| * Discard "deleted" cache entries after using them to update the working treeDaniel Barkalow2008-02-091-7/+9
| * Send unpack-trees debugging output to stderrDaniel Barkalow2008-02-091-7/+7
| * Add flag to make unpack_trees() not print errors.Daniel Barkalow2008-02-091-14/+29
| * Allow callers of unpack_trees() to handle failureDaniel Barkalow2008-02-091-37/+48
View Lorry Controller Status