summaryrefslogtreecommitdiff
path: root/unpack-trees.c
AgeCommit message (Expand)AuthorFilesLines
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
2012-07-23Merge branch 'tg/ce-namelen-field'Libravatar Junio C Hamano1-1/+2
2012-07-11Merge branch 'jc/ls-files-i-dir' into maintLibravatar Junio C Hamano1-1/+10
2012-07-11Strip namelen out of ce_flags into a ce_namelen fieldLibravatar Thomas Gummerer1-1/+2
2012-07-08Replace strlen() with ce_namelen()Libravatar Thomas Gummerer1-1/+1
2012-06-21Merge branch 'jc/ls-files-i-dir'Libravatar Junio C Hamano1-1/+10
2012-06-05unpack-trees.c: use path_excluded() in check_ok_to_remove()Libravatar Junio C Hamano1-1/+10
2012-05-20Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2012-05-20Consistently use "superproject" instead of "supermodule"Libravatar Jens Lehmann1-1/+1
2012-05-02Merge branch 'pw/message-cleanup'Libravatar Junio C Hamano1-1/+1
2012-05-02Merge branch 'jc/index-v4'Libravatar Junio C Hamano1-0/+1
2012-04-30remove superfluous newlines in error messagesLibravatar Pete Wyckoff1-1/+1
2012-04-27unpack-trees: preserve the index file version of originalLibravatar Junio C Hamano1-0/+1
2012-04-10unpack-trees: plug minor memory leakLibravatar René Scharfe1-9/+16
2012-04-10unpack-trees: don't perform any index operation if we're not mergingLibravatar René Scharfe1-1/+1
2011-10-27tree-walk.c: do not leak internal structure in tree_entry_len()Libravatar Nguyễn Thái Ngọc Duy1-3/+3
2011-10-13Merge branch 'nd/maint-sparse-errors'Libravatar Junio C Hamano1-4/+16
2011-10-05Merge branch 'mg/maint-doc-sparse-checkout'Libravatar Junio C Hamano1-1/+1
2011-10-05Merge branch 'jc/diff-index-unpack'Libravatar Junio C Hamano1-0/+2
2011-09-22Add explanation why we do not allow to sparse checkout to empty working treeLibravatar Nguyễn Thái Ngọc Duy1-1/+6
2011-09-22sparse checkout: show error messages when worktree shaping failsLibravatar Nguyễn Thái Ngọc Duy1-3/+10
2011-09-21unpack-trees: print "Aborting" to stderrLibravatar Michael J Gruber1-1/+1
2011-08-29unpack-trees: allow pruning with pathspecLibravatar Junio C Hamano1-0/+2
2011-07-31Merge branch 'maint'Libravatar Junio C Hamano1-2/+13
2011-07-31Break down no-lstat() condition checks in verify_uptodate()Libravatar Nguyễn Thái Ngọc Duy1-2/+13
2011-06-29Merge branch 'jc/diff-index-quick-exit-early'Libravatar Junio C Hamano1-1/+3
2011-05-31diff-index --quiet: learn the "stop feeding the backend early" logicLibravatar Junio C Hamano1-1/+3
2011-05-25unpack-trees: add the dry_run flag to unpack_trees_optionsLibravatar Jens Lehmann1-2/+2
2011-05-10sparse checkout: do not eagerly decide the fate for whole directoryLibravatar Nguyễn Thái Ngọc Duy1-29/+34
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 22:31:07 +0000