summaryrefslogtreecommitdiff
path: root/unpack-trees.c
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | unpack-trees: handle lstat failure for existing directoryJonathan Nieder2011-01-131-5/+9
| * | use persistent memory for rejected pathsClemens Buchacher2010-12-141-25/+11
| * | do not overwrite files in leading pathClemens Buchacher2010-12-141-3/+13
| * | add function check_ok_to_remove()Clemens Buchacher2010-12-141-49/+58
* | | Merge branch 'nd/maint-fix-add-typo-detection'Junio C Hamano2010-12-221-23/+217
|\ \ \ | |_|/ |/| |
| * | unpack-trees: fix sparse checkout's "unable to match directories"Nguyễn Thái Ngọc Duy2010-11-301-10/+144
| * | unpack-trees: move all skip-worktree checks back to unpack_trees()Nguyễn Thái Ngọc Duy2010-11-291-9/+73
| * | dir.c: add free_excludes()Nguyễn Thái Ngọc Duy2010-11-291-5/+1
| |/
* | use persistent memory for rejected pathsClemens Buchacher2010-11-151-25/+11
* | do not overwrite files in leading pathClemens Buchacher2010-10-131-3/+13
* | add function check_ok_to_remove()Clemens Buchacher2010-10-131-49/+58
|/
* Merge branch 'dg/local-mod-error-messages'Junio C Hamano2010-09-031-7/+49
|\
| * Move "show_all_errors = 1" to setup_unpack_trees_porcelain()Matthieu Moy2010-09-031-6/+2
| * setup_unpack_trees_porcelain: take the whole options struct as parameterMatthieu Moy2010-09-031-1/+3
| * Move set_porcelain_error_msgs to unpack-trees.c and rename itMatthieu Moy2010-09-031-1/+45
* | Merge branch 'nd/fix-sparse-checkout'Junio C Hamano2010-08-211-25/+31
|\ \
View Lorry Controller Status