summaryrefslogtreecommitdiff
path: root/unpack-trees.c
AgeCommit message (Expand)Author
2016-01-22unpack-trees: fix accidentally quadratic behaviorDavid Turner
2016-01-05do_compare_entry: use already-computed pathDavid Turner
2015-09-25replace trivial malloc + sprintf / strcpy calls with xstrfmtJeff King
2015-09-09Sync with 2.5.2Junio C Hamano
2015-09-04Sync with 2.4.9Junio C Hamano
2015-09-04Sync with 2.2.3Junio C Hamano
2015-09-04verify_absent: allow filenames longer than PATH_MAXJeff King
2015-08-19Merge branch 'jk/git-path'Junio C Hamano
2015-08-19Merge branch 'as/sparse-checkout-removal' into maintJunio C Hamano
2015-08-12Merge branch 'dt/unpack-trees-cache-tree-revalidate'Junio C Hamano
2015-08-10prefer git_pathdup to git_path in some possibly-dangerous casesJeff King
2015-08-03Merge branch 'as/sparse-checkout-removal'Junio C Hamano
2015-07-28unpack-trees: populate cache-tree on successful mergeBrian Degenhardt
2015-07-21unpack-trees: don't update files with CE_WT_REMOVE setDavid Turner
2015-03-12untracked cache: invalidate at index addition or removalNguyễn Thái Ngọc Duy
2014-12-18Sync with v2.2.1Junio C Hamano
2014-12-17Sync with v2.0.5Junio C Hamano
2014-12-17Sync with v1.9.5Junio C Hamano
2014-12-17Sync with v1.8.5.6Junio C Hamano
2014-12-17Merge branch 'dotgit-case-maint-1.8.5' into maint-1.8.5Junio C Hamano
2014-12-17unpack-trees: propagate errors adding entries to the indexJeff King
2014-12-12Merge branch 'jc/unpack-trees-plug-leak'Junio C Hamano
2014-11-17unpack_trees: plug leakage of o->resultJunio C Hamano
2014-09-19Merge branch 'jn/unpack-trees-checkout-m-carry-deletion' into maintJunio C Hamano
2014-09-11Merge branch 'jn/unpack-trees-checkout-m-carry-deletion'Junio C Hamano
2014-08-25checkout -m: attempt merge when deletion of path was stagedJonathan Nieder
2014-08-13unpack-trees: use 'cuddled' style for if-else cascadeJonathan Nieder
2014-08-13unpack-trees: simplify 'all other failures' caseStefan Beller
2014-07-16Merge branch 'nd/split-index'Junio C Hamano
2014-07-09Merge branch 'jk/xstrfmt'Junio C Hamano
2014-06-20cleanup duplicate name_compare() functionsJeremiah Mahler
2014-06-19use xstrfmt in favor of manual size calculationsJeff King
2014-06-13read-cache: mark updated entries for split indexNguyễn Thái Ngọc Duy
2014-06-13read-cache: split-index modeNguyễn Thái Ngọc Duy
2014-06-13read-cache: save index SHA-1 after readingNguyễn Thái Ngọc Duy
2014-06-13entry.c: update cache_changed if refresh_cache is set in checkout_entry()Nguyễn Thái Ngọc Duy
2014-06-13cache-tree: mark istate->cache_changed on cache tree invalidationNguyễn Thái Ngọc Duy
2014-06-13unpack-trees: be specific what part of the index has changedNguyễn Thái Ngọc Duy
2014-03-14Merge branch 'nd/i18n-progress'Junio C Hamano
2014-02-27Merge branch 'kb/fast-hashmap'Junio C Hamano
2014-02-24i18n: mark all progress lines for translationNguyễn Thái Ngọc Duy
2013-12-17Merge branch 'jk/two-way-merge-corner-case-fix' into maintJunio C Hamano
2013-12-16Prevent buffer overflows when path is too longAntoine Pelisse
2013-12-05Merge branch 'jk/two-way-merge-corner-case-fix'Junio C Hamano
2013-11-18name-hash.c: remove cache entries instead of marking them CE_UNHASHEDKarsten Blees
2013-11-18name-hash.c: use new hash map implementation for cache entriesKarsten Blees
2013-11-04unpack-trees: fix "read-tree -u --reset A B" with conflicted indexJeff King
2013-09-17employ new explicit "exists in index?" APIEric Sunshine
2013-08-13unpack-trees: plug a memory leakFelipe Contreras
2013-07-09Convert "struct cache_entry *" to "const ..." wherever possibleNguyễn Thái Ngọc Duy