summaryrefslogtreecommitdiff
path: root/unpack-trees.c
AgeCommit message (Expand)AuthorFilesLines
2014-12-18Sync with v2.2.1Libravatar Junio C Hamano1-4/+6
2014-12-17Sync with v2.0.5Libravatar Junio C Hamano1-4/+6
2014-12-17Sync with v1.9.5Libravatar Junio C Hamano1-4/+6
2014-12-17Sync with v1.8.5.6Libravatar Junio C Hamano1-4/+6
2014-12-17Merge branch 'dotgit-case-maint-1.8.5' into maint-1.8.5Libravatar Junio C Hamano1-4/+6
2014-12-17unpack-trees: propagate errors adding entries to the indexLibravatar Jeff King1-4/+6
2014-12-12Merge branch 'jc/unpack-trees-plug-leak'Libravatar Junio C Hamano1-0/+2
2014-11-17unpack_trees: plug leakage of o->resultLibravatar Junio C Hamano1-0/+2
2014-09-19Merge branch 'jn/unpack-trees-checkout-m-carry-deletion' into maintLibravatar Junio C Hamano1-21/+10
2014-09-11Merge branch 'jn/unpack-trees-checkout-m-carry-deletion'Libravatar Junio C Hamano1-21/+10
2014-08-25checkout -m: attempt merge when deletion of path was stagedLibravatar Jonathan Nieder1-5/+6
2014-08-13unpack-trees: use 'cuddled' style for if-else cascadeLibravatar Jonathan Nieder1-8/+4
2014-08-13unpack-trees: simplify 'all other failures' caseLibravatar Stefan Beller1-10/+2
2014-07-16Merge branch 'nd/split-index'Libravatar Junio C Hamano1-3/+15
2014-07-09Merge branch 'jk/xstrfmt'Libravatar Junio C Hamano1-11/+6
2014-06-20cleanup duplicate name_compare() functionsLibravatar Jeremiah Mahler1-11/+0
2014-06-19use xstrfmt in favor of manual size calculationsLibravatar Jeff King1-11/+6
2014-06-13read-cache: mark updated entries for split indexLibravatar Nguyễn Thái Ngọc Duy1-1/+3
2014-06-13read-cache: split-index modeLibravatar Nguyễn Thái Ngọc Duy1-0/+4
2014-06-13read-cache: save index SHA-1 after readingLibravatar Nguyễn Thái Ngọc Duy1-0/+1
2014-06-13entry.c: update cache_changed if refresh_cache is set in checkout_entry()Libravatar Nguyễn Thái Ngọc Duy1-0/+1
2014-06-13cache-tree: mark istate->cache_changed on cache tree invalidationLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2014-06-13unpack-trees: be specific what part of the index has changedLibravatar Nguyễn Thái Ngọc Duy1-2/+6
2014-03-14Merge branch 'nd/i18n-progress'Libravatar Junio C Hamano1-1/+1
2014-02-27Merge branch 'kb/fast-hashmap'Libravatar Junio C Hamano1-2/+1
2014-02-24i18n: mark all progress lines for translationLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2013-12-17Merge branch 'jk/two-way-merge-corner-case-fix' into maintLibravatar Junio C Hamano1-8/+17
2013-12-16Prevent buffer overflows when path is too longLibravatar Antoine Pelisse1-24/+27
2013-12-05Merge branch 'jk/two-way-merge-corner-case-fix'Libravatar Junio C Hamano1-8/+17
2013-11-18name-hash.c: remove cache entries instead of marking them CE_UNHASHEDLibravatar Karsten Blees1-1/+1
2013-11-18name-hash.c: use new hash map implementation for cache entriesLibravatar Karsten Blees1-1/+0
2013-11-04unpack-trees: fix "read-tree -u --reset A B" with conflicted indexLibravatar Jeff King1-8/+17
2013-09-17employ new explicit "exists in index?" APILibravatar Eric Sunshine1-2/+2
2013-08-13unpack-trees: plug a memory leakLibravatar Felipe Contreras1-1/+3
2013-07-09Convert "struct cache_entry *" to "const ..." wherever possibleLibravatar Nguyễn Thái Ngọc Duy1-7/+7
2013-06-24Merge branch 'rs/unpack-trees-tree-walk-conflict-field'Libravatar Junio C Hamano1-15/+3
2013-06-17unpack-trees: don't shift conflicts left and rightLibravatar René Scharfe1-15/+3
2013-06-02unpack-trees: free cache_entry array members for mergesLibravatar René Scharfe1-3/+10
2013-06-02diff-lib, read-tree, unpack-trees: mark cache_entry array paramters constLibravatar René Scharfe1-8/+13
2013-06-02diff-lib, read-tree, unpack-trees: mark cache_entry pointers constLibravatar René Scharfe1-41/+50
2013-06-02unpack-trees: create working copy of merge entry in merged_entryLibravatar René Scharfe1-5/+12
2013-06-02unpack-trees: factor out dup_entryLibravatar René Scharfe1-3/+9
2013-04-15dir.c: replace is_path_excluded with now equivalent is_excluded APILibravatar Karsten Blees1-9/+1
2013-01-23Merge branch 'as/check-ignore'Libravatar Junio C Hamano1-1/+1
2013-01-10Merge branch 'as/dir-c-cleanup'Libravatar Junio C Hamano1-5/+7
2013-01-06dir.c: use a single struct exclude_list per source of excludesLibravatar Adam Spiers1-1/+1
2012-12-28dir.c: rename free_excludes() to clear_exclude_list()Libravatar Adam Spiers1-1/+1
2012-12-28dir.c: rename excluded_from_list() to is_excluded_from_list()Libravatar Adam Spiers1-3/+5
2012-12-28dir.c: rename path_excluded() to is_path_excluded()Libravatar Adam Spiers1-1/+1
2012-12-20oneway_merge(): only lstat() when told to update worktreeLibravatar Martin von Zweigbergk1-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 00:29:01 +0000