summaryrefslogtreecommitdiff
path: root/unpack-trees.c
Commit message (Expand)AuthorAgeFilesLines
* Sync with v1.9.5Junio C Hamano2014-12-171-4/+6
|\
| * Sync with v1.8.5.6Junio C Hamano2014-12-171-4/+6
| |\
| | * Merge branch 'dotgit-case-maint-1.8.5' into maint-1.8.5Junio C Hamano2014-12-171-4/+6
| | |\
| | | * unpack-trees: propagate errors adding entries to the indexJeff King2014-12-171-4/+6
| | * | Merge branch 'jk/two-way-merge-corner-case-fix' into maintJunio C Hamano2013-12-171-8/+17
| | |\ \ | | | |/ | | |/|
* | | | Merge branch 'nd/i18n-progress'Junio C Hamano2014-03-141-1/+1
|\ \ \ \
| * | | | i18n: mark all progress lines for translationnd/i18n-progressNguyễn Thái Ngọc Duy2014-02-241-1/+1
| |/ / /
* | | | Merge branch 'kb/fast-hashmap'Junio C Hamano2014-02-271-2/+1
|\ \ \ \ | |/ / / |/| | |
| * | | name-hash.c: remove cache entries instead of marking them CE_UNHASHEDKarsten Blees2013-11-181-1/+1
| * | | name-hash.c: use new hash map implementation for cache entriesKarsten Blees2013-11-181-1/+0
| |/ /
* | | Prevent buffer overflows when path is too longap/path-maxAntoine Pelisse2013-12-161-24/+27
* | | Merge branch 'jk/two-way-merge-corner-case-fix'Junio C Hamano2013-12-051-8/+17
|\ \ \ | |/ / |/| / | |/
| * unpack-trees: fix "read-tree -u --reset A B" with conflicted indexJeff King2013-11-041-8/+17
* | employ new explicit "exists in index?" APIEric Sunshine2013-09-171-2/+2
* | unpack-trees: plug a memory leakfc/unpack-trees-leakfixFelipe Contreras2013-08-131-1/+3
* | Convert "struct cache_entry *" to "const ..." wherever possiblend/const-struct-cache-entryNguyễn Thái Ngọc Duy2013-07-091-7/+7
* | Merge branch 'rs/unpack-trees-tree-walk-conflict-field'Junio C Hamano2013-06-241-15/+3
|\ \
| * | unpack-trees: don't shift conflicts left and rightRené Scharfe2013-06-171-15/+3
* | | unpack-trees: free cache_entry array members for mergesRené Scharfe2013-06-021-3/+10
* | | diff-lib, read-tree, unpack-trees: mark cache_entry array paramters constRené Scharfe2013-06-021-8/+13
* | | diff-lib, read-tree, unpack-trees: mark cache_entry pointers constRené Scharfe2013-06-021-41/+50
* | | unpack-trees: create working copy of merge entry in merged_entryRené Scharfe2013-06-021-5/+12
* | | unpack-trees: factor out dup_entryRené Scharfe2013-06-021-3/+9
|/ /
* | dir.c: replace is_path_excluded with now equivalent is_excluded APIKarsten Blees2013-04-151-9/+1
* | Merge branch 'as/check-ignore'Junio C Hamano2013-01-231-1/+1
|\ \
| * | dir.c: use a single struct exclude_list per source of excludesAdam Spiers2013-01-061-1/+1
* | | Merge branch 'as/dir-c-cleanup'Junio C Hamano2013-01-101-5/+7
|\ \ \ | |/ /
| * | dir.c: rename free_excludes() to clear_exclude_list()Adam Spiers2012-12-281-1/+1
| * | dir.c: rename excluded_from_list() to is_excluded_from_list()Adam Spiers2012-12-281-3/+5
| * | dir.c: rename path_excluded() to is_path_excluded()Adam Spiers2012-12-281-1/+1
| * | Merge branch 'jc/ls-files-i-dir' into maintJunio C Hamano2012-07-111-1/+10
| |\ \
* | | | oneway_merge(): only lstat() when told to update worktreeMartin von Zweigbergk2012-12-201-1/+1
* | | | Merge branch 'tg/ce-namelen-field'Junio C Hamano2012-07-231-1/+2
|\ \ \ \
| * | | | Strip namelen out of ce_flags into a ce_namelen fieldThomas Gummerer2012-07-111-1/+2
* | | | | Replace strlen() with ce_namelen()Thomas Gummerer2012-07-081-1/+1
|/ / / /
* | | | Merge branch 'jc/ls-files-i-dir'Junio C Hamano2012-06-211-1/+10
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | unpack-trees.c: use path_excluded() in check_ok_to_remove()Junio C Hamano2012-06-051-1/+10
| |/
* | Merge branch 'maint'Junio C Hamano2012-05-201-1/+1
|\ \
| * | Consistently use "superproject" instead of "supermodule"Jens Lehmann2012-05-201-1/+1
* | | Merge branch 'pw/message-cleanup'Junio C Hamano2012-05-021-1/+1
|\ \ \
| * | | remove superfluous newlines in error messagesPete Wyckoff2012-04-301-1/+1
| |/ /
* | | Merge branch 'jc/index-v4'Junio C Hamano2012-05-021-0/+1
|\ \ \ | |/ / |/| |
| * | unpack-trees: preserve the index file version of originalJunio C Hamano2012-04-271-0/+1
| |/
* | unpack-trees: plug minor memory leakRené Scharfe2012-04-101-9/+16
* | unpack-trees: don't perform any index operation if we're not mergingRené Scharfe2012-04-101-1/+1
|/
* tree-walk.c: do not leak internal structure in tree_entry_len()Nguyễn Thái Ngọc Duy2011-10-271-3/+3
* Merge branch 'nd/maint-sparse-errors'Junio C Hamano2011-10-131-4/+16
|\
| * Add explanation why we do not allow to sparse checkout to empty working treend/maint-sparse-errorsNguyễn Thái Ngọc Duy2011-09-221-1/+6
| * sparse checkout: show error messages when worktree shaping failsNguyễn Thái Ngọc Duy2011-09-221-3/+10
* | Merge branch 'mg/maint-doc-sparse-checkout'Junio C Hamano2011-10-051-1/+1
|\ \
View Lorry Controller Status