summaryrefslogtreecommitdiff
path: root/unpack-trees.c
AgeCommit message (Expand)AuthorFilesLines
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
2011-03-22Fix sparse warningsLibravatar Stephen Boyd1-1/+1
2011-02-15Revert "unpack_trees(): skip trees that are the same in all input"Libravatar Junio C Hamano1-56/+0
2011-02-09Merge branch 'jc/unpack-trees'Libravatar Junio C Hamano1-2/+62
2011-02-09Merge branch 'jn/unpack-lstat-failure-report'Libravatar Junio C Hamano1-6/+12
2011-01-13unpack-trees: handle lstat failure for existing fileLibravatar Jonathan Nieder1-1/+3
2011-01-13unpack-trees: handle lstat failure for existing directoryLibravatar Jonathan Nieder1-5/+9
2011-01-04unpack_trees(): skip trees that are the same in all inputLibravatar Junio C Hamano1-0/+56
2010-12-22Merge branch 'nd/maint-fix-add-typo-detection'Libravatar Junio C Hamano1-23/+217
2010-12-22unpack-trees.c: cosmetic fixLibravatar Junio C Hamano1-4/+8
2010-12-14use persistent memory for rejected pathsLibravatar Clemens Buchacher1-25/+11
2010-12-14do not overwrite files in leading pathLibravatar Clemens Buchacher1-3/+13
2010-12-14add function check_ok_to_remove()Libravatar Clemens Buchacher1-49/+58
2010-11-30unpack-trees: fix sparse checkout's "unable to match directories"Libravatar Nguyễn Thái Ngọc Duy1-10/+144
2010-11-29unpack-trees: move all skip-worktree checks back to unpack_trees()Libravatar Nguyễn Thái Ngọc Duy1-9/+73
2010-11-29dir.c: add free_excludes()Libravatar Nguyễn Thái Ngọc Duy1-5/+1
2010-11-15use persistent memory for rejected pathsLibravatar Clemens Buchacher1-25/+11
2010-10-13do not overwrite files in leading pathLibravatar Clemens Buchacher1-3/+13
2010-10-13add function check_ok_to_remove()Libravatar Clemens Buchacher1-49/+58
2010-09-03Merge branch 'dg/local-mod-error-messages'Libravatar Junio C Hamano1-7/+49
2010-09-03Move "show_all_errors = 1" to setup_unpack_trees_porcelain()Libravatar Matthieu Moy1-6/+2
2010-09-03setup_unpack_trees_porcelain: take the whole options struct as parameterLibravatar Matthieu Moy1-1/+3
2010-09-03Move set_porcelain_error_msgs to unpack-trees.c and rename itLibravatar Matthieu Moy1-1/+45
2010-08-21Merge branch 'nd/fix-sparse-checkout'Libravatar Junio C Hamano1-25/+31
2010-08-21Merge branch 'dg/local-mod-error-messages'Libravatar Junio C Hamano1-41/+124
2010-08-11unpack_trees: group error messages by typeLibravatar Matthieu Moy1-4/+74
2010-08-11merge-recursive: distinguish "removed" and "overwritten" messagesLibravatar Matthieu Moy1-25/+39