aboutsummaryrefslogtreecommitdiff
path: root/unpack-trees.c
Commit message (Expand)AuthorAge
* Merge branch 'pw/message-cleanup'Junio C Hamano2012-05-02
|\
| * remove superfluous newlines in error messagesPete Wyckoff2012-04-30
* | Merge branch 'jc/index-v4'Junio C Hamano2012-05-02
|\ \ | |/ |/|
| * unpack-trees: preserve the index file version of originalJunio C Hamano2012-04-27
* | unpack-trees: plug minor memory leakRené Scharfe2012-04-10
* | unpack-trees: don't perform any index operation if we're not mergingRené Scharfe2012-04-10
|/
* tree-walk.c: do not leak internal structure in tree_entry_len()Nguyễn Thái Ngọc Duy2011-10-27
* Merge branch 'nd/maint-sparse-errors'Junio C Hamano2011-10-13
|\
| * Add explanation why we do not allow to sparse checkout to empty working treeNguyễn Thái Ngọc Duy2011-09-22
| * sparse checkout: show error messages when worktree shaping failsNguyễn Thái Ngọc Duy2011-09-22
* | Merge branch 'mg/maint-doc-sparse-checkout'Junio C Hamano2011-10-05
|\ \
| * | unpack-trees: print "Aborting" to stderrMichael J Gruber2011-09-21
| |/
* | Merge branch 'jc/diff-index-unpack'Junio C Hamano2011-10-05
|\ \
| * | unpack-trees: allow pruning with pathspecJunio C Hamano2011-08-29
| |/
* | Merge branch 'maint'Junio C Hamano2011-07-31
|\ \
| * | Break down no-lstat() condition checks in verify_uptodate()Nguyễn Thái Ngọc Duy2011-07-31
| |/
* | Merge branch 'jc/diff-index-quick-exit-early'Junio C Hamano2011-06-29
|\ \ | |/ |/|
| * diff-index --quiet: learn the "stop feeding the backend early" logicJunio C Hamano2011-05-31
* | unpack-trees: add the dry_run flag to unpack_trees_optionsJens Lehmann2011-05-25
* | sparse checkout: do not eagerly decide the fate for whole directoryNguyễn Thái Ngọc Duy2011-05-10
|/
* Fix sparse warningsStephen Boyd2011-03-22
* Revert "unpack_trees(): skip trees that are the same in all input"Junio C Hamano2011-02-15
* Merge branch 'jc/unpack-trees'Junio C Hamano2011-02-09
|\
| * unpack_trees(): skip trees that are the same in all inputJunio C Hamano2011-01-04
| * unpack-trees.c: cosmetic fixJunio C Hamano2010-12-22
* | Merge branch 'jn/unpack-lstat-failure-report'Junio C Hamano2011-02-09
|\ \
| * | unpack-trees: handle lstat failure for existing fileJonathan Nieder2011-01-13
| * | unpack-trees: handle lstat failure for existing directoryJonathan Nieder2011-01-13
| * | use persistent memory for rejected pathsClemens Buchacher2010-12-14
| * | do not overwrite files in leading pathClemens Buchacher2010-12-14
| * | add function check_ok_to_remove()Clemens Buchacher2010-12-14
* | | Merge branch 'nd/maint-fix-add-typo-detection'Junio C Hamano2010-12-22
|\ \ \ | |_|/ |/| |
| * | unpack-trees: fix sparse checkout's "unable to match directories"Nguyễn Thái Ngọc Duy2010-11-30
| * | unpack-trees: move all skip-worktree checks back to unpack_trees()Nguyễn Thái Ngọc Duy2010-11-29
| * | dir.c: add free_excludes()Nguyễn Thái Ngọc Duy2010-11-29
| |/
* | use persistent memory for rejected pathsClemens Buchacher2010-11-15
* | do not overwrite files in leading pathClemens Buchacher2010-10-13
* | add function check_ok_to_remove()Clemens Buchacher2010-10-13
|/
* Merge branch 'dg/local-mod-error-messages'Junio C Hamano2010-09-03
|\
| * Move "show_all_errors = 1" to setup_unpack_trees_porcelain()Matthieu Moy2010-09-03
| * setup_unpack_trees_porcelain: take the whole options struct as parameterMatthieu Moy2010-09-03
| * Move set_porcelain_error_msgs to unpack-trees.c and rename itMatthieu Moy2010-09-03
* | Merge branch 'nd/fix-sparse-checkout'Junio C Hamano2010-08-21
|\ \
| * | unpack-trees: mark new entries skip-worktree appropriatelyNguyễn Thái Ngọc Duy2010-08-09
| * | unpack-trees: do not check for conflict entries too earlyNguyễn Thái Ngọc Duy2010-08-09
| * | unpack-trees: let read-tree -u remove index entries outside sparse areaNguyễn Thái Ngọc Duy2010-08-09
| * | unpack-trees: only clear CE_UPDATE|CE_REMOVE when skip-worktree is always setNguyễn Thái Ngọc Duy2010-08-09
* | | Merge branch 'dg/local-mod-error-messages'Junio C Hamano2010-08-21
|\ \ \ | | |/ | |/|
| * | unpack_trees: group error messages by typeMatthieu Moy2010-08-11
| * | merge-recursive: distinguish "removed" and "overwritten" messagesMatthieu Moy2010-08-11