summaryrefslogtreecommitdiff
path: root/unpack-trees.c
AgeCommit message (Expand)Author
2013-07-09Convert "struct cache_entry *" to "const ..." wherever possibleNguyễn Thái Ngọc Duy
2013-06-24Merge branch 'rs/unpack-trees-tree-walk-conflict-field'Junio C Hamano
2013-06-17unpack-trees: don't shift conflicts left and rightRené Scharfe
2013-06-02unpack-trees: free cache_entry array members for mergesRené Scharfe
2013-06-02diff-lib, read-tree, unpack-trees: mark cache_entry array paramters constRené Scharfe
2013-06-02diff-lib, read-tree, unpack-trees: mark cache_entry pointers constRené Scharfe
2013-06-02unpack-trees: create working copy of merge entry in merged_entryRené Scharfe
2013-06-02unpack-trees: factor out dup_entryRené Scharfe
2013-04-15dir.c: replace is_path_excluded with now equivalent is_excluded APIKarsten Blees
2013-01-24Merge branch 'as/check-ignore'Junio C Hamano
2013-01-10Merge branch 'as/dir-c-cleanup'Junio C Hamano
2013-01-06dir.c: use a single struct exclude_list per source of excludesAdam Spiers
2012-12-28dir.c: rename free_excludes() to clear_exclude_list()Adam Spiers
2012-12-28dir.c: rename excluded_from_list() to is_excluded_from_list()Adam Spiers
2012-12-28dir.c: rename path_excluded() to is_path_excluded()Adam Spiers
2012-12-20oneway_merge(): only lstat() when told to update worktreeMartin von Zweigbergk
2012-07-24Merge branch 'tg/ce-namelen-field'Junio C Hamano
2012-07-11Merge branch 'jc/ls-files-i-dir' into maintJunio C Hamano
2012-07-11Strip namelen out of ce_flags into a ce_namelen fieldThomas Gummerer
2012-07-09Replace strlen() with ce_namelen()Thomas Gummerer
2012-06-21Merge branch 'jc/ls-files-i-dir'Junio C Hamano
2012-06-06unpack-trees.c: use path_excluded() in check_ok_to_remove()Junio C Hamano
2012-05-20Merge branch 'maint'Junio C Hamano
2012-05-20Consistently use "superproject" instead of "supermodule"Jens Lehmann
2012-05-02Merge branch 'pw/message-cleanup'Junio C Hamano
2012-05-02Merge branch 'jc/index-v4'Junio C Hamano
2012-04-30remove superfluous newlines in error messagesPete Wyckoff
2012-04-27unpack-trees: preserve the index file version of originalJunio C Hamano
2012-04-10unpack-trees: plug minor memory leakRené Scharfe
2012-04-10unpack-trees: don't perform any index operation if we're not mergingRené Scharfe
2011-10-27tree-walk.c: do not leak internal structure in tree_entry_len()Nguyễn Thái Ngọc Duy
2011-10-14Merge branch 'nd/maint-sparse-errors'Junio C Hamano
2011-10-05Merge branch 'mg/maint-doc-sparse-checkout'Junio C Hamano
2011-10-05Merge branch 'jc/diff-index-unpack'Junio C Hamano
2011-09-22Add explanation why we do not allow to sparse checkout to empty working treeNguyễn Thái Ngọc Duy
2011-09-22sparse checkout: show error messages when worktree shaping failsNguyễn Thái Ngọc Duy
2011-09-21unpack-trees: print "Aborting" to stderrMichael J Gruber
2011-08-29unpack-trees: allow pruning with pathspecJunio C Hamano
2011-08-01Merge branch 'maint'Junio C Hamano
2011-08-01Break down no-lstat() condition checks in verify_uptodate()Nguyễn Thái Ngọc Duy
2011-06-30Merge branch 'jc/diff-index-quick-exit-early'Junio C Hamano
2011-05-31diff-index --quiet: learn the "stop feeding the backend early" logicJunio C Hamano
2011-05-25unpack-trees: add the dry_run flag to unpack_trees_optionsJens Lehmann
2011-05-10sparse checkout: do not eagerly decide the fate for whole directoryNguyễn Thái Ngọc Duy
2011-03-22Fix sparse warningsStephen Boyd
2011-02-15Revert "unpack_trees(): skip trees that are the same in all input"Junio C Hamano
2011-02-10Merge branch 'jc/unpack-trees'Junio C Hamano
2011-02-10Merge branch 'jn/unpack-lstat-failure-report'Junio C Hamano
2011-01-13unpack-trees: handle lstat failure for existing fileJonathan Nieder
2011-01-13unpack-trees: handle lstat failure for existing directoryJonathan Nieder