summaryrefslogtreecommitdiff
path: root/unpack-trees.c
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * | unpack-trees: print "Aborting" to stderrMichael J Gruber2011-09-211-1/+1
| |/
* | Merge branch 'jc/diff-index-unpack'Junio C Hamano2011-10-051-0/+2
|\ \
| * | unpack-trees: allow pruning with pathspecJunio C Hamano2011-08-291-0/+2
| |/
* | Merge branch 'maint'Junio C Hamano2011-07-311-2/+13
|\ \
| * | Break down no-lstat() condition checks in verify_uptodate()Nguyễn Thái Ngọc Duy2011-07-311-2/+13
| |/
* | Merge branch 'jc/diff-index-quick-exit-early'Junio C Hamano2011-06-291-1/+3
|\ \ | |/ |/|
| * diff-index --quiet: learn the "stop feeding the backend early" logicJunio C Hamano2011-05-311-1/+3
* | unpack-trees: add the dry_run flag to unpack_trees_optionsJens Lehmann2011-05-251-2/+2
* | sparse checkout: do not eagerly decide the fate for whole directoryNguyễn Thái Ngọc Duy2011-05-101-29/+34
|/
* Fix sparse warningsStephen Boyd2011-03-221-1/+1
* Revert "unpack_trees(): skip trees that are the same in all input"Junio C Hamano2011-02-151-56/+0
* Merge branch 'jc/unpack-trees'Junio C Hamano2011-02-091-2/+62
|\
| * unpack_trees(): skip trees that are the same in all inputJunio C Hamano2011-01-041-0/+56
| * unpack-trees.c: cosmetic fixJunio C Hamano2010-12-221-4/+8
* | Merge branch 'jn/unpack-lstat-failure-report'Junio C Hamano2011-02-091-6/+12
|\ \
| * | unpack-trees: handle lstat failure for existing fileJonathan Nieder2011-01-131-1/+3
View Lorry Controller Status