summaryrefslogtreecommitdiff
path: root/unpack-trees.c
AgeCommit message (Expand)Author
2009-11-21Merge branch 'jc/fix-tree-walk' (early part)Junio C Hamano
2009-10-25Use 'fast-forward' all over the placeFelipe Contreras
2009-10-11unpack_callback(): use unpack_failed() consistentlyJunio C Hamano
2009-10-11unpack-trees: typofixJunio C Hamano
2009-07-18Merge branch 'maint'Junio C Hamano
2009-07-18checkout -f: deal with a D/F conflict entry correctlyJunio C Hamano
2009-07-14Fix extraneous lstat's in 'git checkout -f'Linus Torvalds
2009-07-11unpack-trees.c: work around run-time array initialization flaw on IRIX 6.5Brandon Casey
2009-07-09Simplify read_directory[_recursive]() argumentsLinus Torvalds
2009-06-21Fix various sparse warnings in the git source codeLinus Torvalds
2009-05-25Optimize "diff-index --cached" using cache-treeJunio C Hamano
2009-04-30replace direct calls to unlink(2) with unlink_or_warnAlex Riesen
2009-04-18unpack-trees: do not muck with attributes when we are not checking outJunio C Hamano
2009-03-26Merge branch 'jc/attributes-checkout'Junio C Hamano
2009-03-18Merge branch 'jc/maint-1.6.0-read-tree-overlay'Junio C Hamano
2009-03-14Read attributes from the index that is being checked outJunio C Hamano
2009-03-13read-tree A B C: do not create a bogus index and do not segfaultJunio C Hamano
2009-03-08Record ns-timestamps if possible, but do not use it without USE_NSECKjetil Barvik
2009-02-20verify_uptodate(): add ce_uptodate(ce) testKjetil Barvik
2009-02-20make USE_NSEC work as expectedKjetil Barvik
2009-02-19check_updates(): effective removal of cache entries marked CE_REMOVEKjetil Barvik
2009-02-10unlink_entry(): introduce schedule_dir_for_removal()Kjetil Barvik
2009-02-10lstat_cache(): swap func(length, string) into func(string, length)Kjetil Barvik
2009-02-01Merge branch 'maint'Junio C Hamano
2009-02-01Merge branch 'maint-1.6.0' into maintJunio C Hamano
2009-01-31merge: fix out-of-bounds memory accessRené Scharfe
2009-01-26Merge branch 'kb/lstat-cache'Junio C Hamano
2009-01-24Merge branch 'cb/maint-unpack-trees-absense' into maintJunio C Hamano
2009-01-18lstat_cache(): introduce has_symlink_or_noent_leading_path() functionKjetil Barvik
2009-01-14Merge branch 'cb/maint-unpack-trees-absense'Junio C Hamano
2009-01-05unpack-trees: remove redundant path search in verify_absentClemens Buchacher
2009-01-05unpack-trees: fix path search bug in verify_absentClemens Buchacher
2009-01-05unpack-trees: handle failure in verify_absentClemens Buchacher
2008-11-11Fix non-literal format in printf-style callsDaniel Lowe
2008-11-02correct cache_entry allocationJeff King
2008-09-10checkout: do not lose staged removalJunio C Hamano
2008-08-24unpack_trees(): protect the handcrafted in-core index from read_cache()Junio C Hamano
2008-05-30unpack_trees(): allow callers to differentiate worktree errors from merge errorsJunio C Hamano
2008-05-20unpack-trees: allow Porcelain to give different error messagesJunio C Hamano
2008-05-11Optimize symlink/directory detectionLinus Torvalds
2008-04-09Make unpack-tree update removed files before any updated filesLinus Torvalds
2008-04-09Make branch merging aware of underlying case-insensitive filsystemsLinus Torvalds
2008-04-09Make hash_name_lookup able to do case-independent lookupsLinus Torvalds
2008-04-09Make "index_name_exists()" return the cache_entry it foundLinus Torvalds
2008-03-19Fix read-tree not to discard errorsJunio C Hamano
2008-03-16Don't update unchanged merge entriesLinus Torvalds
2008-03-15Fix recent 'unpack_trees()'-related changes breaking 'git stash'Linus Torvalds
2008-03-14read-tree() and unpack_trees(): use consistent limitJunio C Hamano
2008-03-11unpack_trees(): fix diff-index regression.Linus Torvalds
2008-03-10traverse_trees_recursive(): propagate merge errors upJunio C Hamano