aboutsummaryrefslogtreecommitdiff
path: root/unpack-trees.c
Commit message (Expand)AuthorAge
* Merge branch 'jc/maint-1.6.0-read-tree-overlay' into maintJunio C Hamano2009-03-21
|\
| * read-tree A B C: do not create a bogus index and do not segfaultJunio C Hamano2009-03-12
* | Merge branch 'maint'Junio C Hamano2009-01-31
|\ \
| * \ Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-01-31
| |\ \
| | * | merge: fix out-of-bounds memory accessRené Scharfe2009-01-31
| * | | Merge branch 'cb/maint-unpack-trees-absense' into maintJunio C Hamano2009-01-23
| |\ \ \ | | |/ / | |/| |
* | | | Merge branch 'kb/lstat-cache'Junio C Hamano2009-01-25
|\ \ \ \
| * | | | lstat_cache(): introduce has_symlink_or_noent_leading_path() functionKjetil Barvik2009-01-18
| |/ / /
* | | | Merge branch 'cb/maint-unpack-trees-absense'Junio C Hamano2009-01-13
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | unpack-trees: remove redundant path search in verify_absentClemens Buchacher2009-01-05
| * | unpack-trees: fix path search bug in verify_absentClemens Buchacher2009-01-05
| * | unpack-trees: handle failure in verify_absentClemens Buchacher2009-01-05
| |/
* | Fix non-literal format in printf-style callsDaniel Lowe2008-11-11
* | correct cache_entry allocationJeff King2008-11-01
* | checkout: do not lose staged removalJunio C Hamano2008-09-09
* | unpack_trees(): protect the handcrafted in-core index from read_cache()Junio C Hamano2008-08-23
|/
* unpack_trees(): allow callers to differentiate worktree errors from merge errorsJunio C Hamano2008-05-29
* unpack-trees: allow Porcelain to give different error messagesJunio C Hamano2008-05-19
* Optimize symlink/directory detectionLinus Torvalds2008-05-10
* Make unpack-tree update removed files before any updated filesLinus Torvalds2008-04-09
* Make branch merging aware of underlying case-insensitive filsystemsLinus Torvalds2008-04-09
* Make hash_name_lookup able to do case-independent lookupsLinus Torvalds2008-04-09
* Make "index_name_exists()" return the cache_entry it foundLinus Torvalds2008-04-09
* Fix read-tree not to discard errorsJunio C Hamano2008-03-18
* Don't update unchanged merge entriesLinus Torvalds2008-03-16
* Fix recent 'unpack_trees()'-related changes breaking 'git stash'Linus Torvalds2008-03-14
* read-tree() and unpack_trees(): use consistent limitJunio C Hamano2008-03-13
* unpack_trees(): fix diff-index regression.Linus Torvalds2008-03-10
* traverse_trees_recursive(): propagate merge errors upJunio C Hamano2008-03-10
* unpack_trees(): minor memory leak fix in unused destination indexLinus Torvalds2008-03-09
* Make 'unpack_trees()' have a separate source and destination indexLinus Torvalds2008-03-09
* Make 'unpack_trees()' take the index to work on as an argumentLinus Torvalds2008-03-09
* Move 'unpack_trees()' over to 'traverse_trees()' interfaceLinus Torvalds2008-03-09
* Merge branch 'db/checkout'Junio C Hamano2008-02-27
|\
| * Add "skip_unmerged" option to unpack_trees.Daniel Barkalow2008-02-09
| * Discard "deleted" cache entries after using them to update the working treeDaniel Barkalow2008-02-09
| * Send unpack-trees debugging output to stderrDaniel Barkalow2008-02-09
| * Add flag to make unpack_trees() not print errors.Daniel Barkalow2008-02-09
| * Allow callers of unpack_trees() to handle failureDaniel Barkalow2008-02-09
* | Be more verbose when checkout takes a long timeLinus Torvalds2008-02-24
* | Use helper function for copying index entry informationLinus Torvalds2008-02-22
* | Merge branch 'jc/gitignore-ends-with-slash'Junio C Hamano2008-02-16
|\ \ | |/ |/|
| * gitignore: lazily find dtypeJunio C Hamano2008-02-05
| * gitignore(5): Allow "foo/" in ignore list to match directory "foo"Junio C Hamano2008-02-05
* | Make on-disk index representation separate from in-core oneLinus Torvalds2008-01-21
|/
* unpack-trees: FLEX_ARRAY fixLinus Torvalds2007-12-18
* per-directory-exclude: lazily read .gitignore filesJunio C Hamano2007-11-29
* Merge branch 'jc/maint-add-sync-stat'Junio C Hamano2007-11-14
|\
| * ce_match_stat, run_diff_files: use symbolic constants for readabilityJunio C Hamano2007-11-10
* | relax usage of the progress APINicolas Pitre2007-10-30