summaryrefslogtreecommitdiff
path: root/unpack-trees.c
AgeCommit message (Expand)AuthorFilesLines
2009-10-24Use 'fast-forward' all over the placeLibravatar Felipe Contreras1-1/+1
2009-07-18Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2009-07-18checkout -f: deal with a D/F conflict entry correctlyLibravatar Junio C Hamano1-1/+1
2009-07-14Fix extraneous lstat's in 'git checkout -f'Libravatar Linus Torvalds1-1/+1
2009-07-10unpack-trees.c: work around run-time array initialization flaw on IRIX 6.5Libravatar Brandon Casey1-1/+1
2009-07-09Simplify read_directory[_recursive]() argumentsLibravatar Linus Torvalds1-1/+1
2009-06-20Fix various sparse warnings in the git source codeLibravatar Linus Torvalds1-1/+1
2009-05-25Optimize "diff-index --cached" using cache-treeLibravatar Junio C Hamano1-0/+17
2009-04-29replace direct calls to unlink(2) with unlink_or_warnLibravatar Alex Riesen1-1/+1
2009-04-17unpack-trees: do not muck with attributes when we are not checking outLibravatar Junio C Hamano1-2/+4
2009-03-26Merge branch 'jc/attributes-checkout'Libravatar Junio C Hamano1-0/+3
2009-03-17Merge branch 'jc/maint-1.6.0-read-tree-overlay'Libravatar Junio C Hamano1-3/+3
2009-03-13Read attributes from the index that is being checked outLibravatar Junio C Hamano1-0/+3
2009-03-12read-tree A B C: do not create a bogus index and do not segfaultLibravatar Junio C Hamano1-3/+3
2009-03-07Record ns-timestamps if possible, but do not use it without USE_NSECLibravatar Kjetil Barvik1-2/+0
2009-02-19verify_uptodate(): add ce_uptodate(ce) testLibravatar Kjetil Barvik1-1/+1
2009-02-19make USE_NSEC work as expectedLibravatar Kjetil Barvik1-2/+6
2009-02-18check_updates(): effective removal of cache entries marked CE_REMOVELibravatar Kjetil Barvik1-3/+1
2009-02-09unlink_entry(): introduce schedule_dir_for_removal()Libravatar Kjetil Barvik1-24/+6
2009-02-09lstat_cache(): swap func(length, string) into func(string, length)Libravatar Kjetil Barvik1-2/+2
2009-01-31Merge branch 'maint'Libravatar Junio C Hamano1-3/+6
2009-01-31Merge branch 'maint-1.6.0' into maintLibravatar Junio C Hamano1-3/+6
2009-01-31merge: fix out-of-bounds memory accessLibravatar René Scharfe1-3/+6
2009-01-25Merge branch 'kb/lstat-cache'Libravatar Junio C Hamano1-2/+2
2009-01-23Merge branch 'cb/maint-unpack-trees-absense' into maintLibravatar Junio C Hamano1-18/+16
2009-01-18lstat_cache(): introduce has_symlink_or_noent_leading_path() functionLibravatar Kjetil Barvik1-2/+2
2009-01-13Merge branch 'cb/maint-unpack-trees-absense'Libravatar Junio C Hamano1-18/+16
2009-01-05unpack-trees: remove redundant path search in verify_absentLibravatar Clemens Buchacher1-6/+2
2009-01-05unpack-trees: fix path search bug in verify_absentLibravatar Clemens Buchacher1-10/+10
2009-01-05unpack-trees: handle failure in verify_absentLibravatar Clemens Buchacher1-3/+5
2008-11-11Fix non-literal format in printf-style callsLibravatar Daniel Lowe1-1/+1
2008-11-01correct cache_entry allocationLibravatar Jeff King1-1/+1
2008-09-09checkout: do not lose staged removalLibravatar Junio C Hamano1-1/+10
2008-08-23unpack_trees(): protect the handcrafted in-core index from read_cache()Libravatar Junio C Hamano1-0/+1
2008-05-29unpack_trees(): allow callers to differentiate worktree errors from merge errorsLibravatar Junio C Hamano1-3/+7
2008-05-19unpack-trees: allow Porcelain to give different error messagesLibravatar Junio C Hamano1-14/+41
2008-05-10Optimize symlink/directory detectionLibravatar Linus Torvalds1-7/+5
2008-04-09Make unpack-tree update removed files before any updated filesLibravatar Linus Torvalds1-2/+7
2008-04-09Make branch merging aware of underlying case-insensitive filsystemsLibravatar Linus Torvalds1-0/+26
2008-04-09Make hash_name_lookup able to do case-independent lookupsLibravatar Linus Torvalds1-1/+1
2008-04-09Make "index_name_exists()" return the cache_entry it foundLibravatar Linus Torvalds1-4/+4
2008-03-18Fix read-tree not to discard errorsLibravatar Junio C Hamano1-3/+6
2008-03-16Don't update unchanged merge entriesLibravatar Linus Torvalds1-3/+6
2008-03-14Fix recent 'unpack_trees()'-related changes breaking 'git stash'Libravatar Linus Torvalds1-0/+2
2008-03-13read-tree() and unpack_trees(): use consistent limitLibravatar Junio C Hamano1-3/+3
2008-03-10unpack_trees(): fix diff-index regression.Libravatar Linus Torvalds1-2/+0
2008-03-10traverse_trees_recursive(): propagate merge errors upLibravatar Junio C Hamano1-3/+4
2008-03-09unpack_trees(): minor memory leak fix in unused destination indexLibravatar Linus Torvalds1-0/+1
2008-03-09Make 'unpack_trees()' have a separate source and destination indexLibravatar Linus Torvalds1-77/+72
2008-03-09Make 'unpack_trees()' take the index to work on as an argumentLibravatar Linus Torvalds1-39/+40