aboutsummaryrefslogtreecommitdiff
path: root/unpack-trees.c
Commit message (Expand)AuthorAge
* Merge branch 'jc/diff-index-quick-exit-early' into maintJunio C Hamano2011-08-16
|\
| * diff-index --quiet: learn the "stop feeding the backend early" logicJunio C Hamano2011-05-31
* | Break down no-lstat() condition checks in verify_uptodate()Nguyễn Thái Ngọc Duy2011-07-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
| * | merge-recursive: porcelain messages for checkoutDiane Gasselin2010-08-11
| * | Turn unpack_trees_options.msgs into an array + enumMatthieu Moy2010-08-11
* | | read-tree: stop leaking tree objectsJonathan Nieder2010-08-11
|/ /
* | Merge branch 'bd/maint-unpack-trees-parawalk-fix'Junio C Hamano2010-06-22
|\ \
| * | unpack-trees: Make index lookahead less pessimalBrian Downing2010-06-18
| |/
* | Merge branch 'gv/portable'Junio C Hamano2010-06-21
|\ \
| * | Rewrite dynamic structure initializations to runtime assignmentGary V. Vaughan2010-05-31
| |/
* | Merge branch 'cb/assume-unchanged-fix'Junio C Hamano2010-06-13
|\ \
| * | do not overwrite files marked "assume unchanged"Clemens Buchacher2010-05-01
| |/
* | Introduce remove_or_warn functionPeter Collingbourne2010-03-28
|/
* Merge branch 'jc/fix-tree-walk'Junio C Hamano2010-01-24
|\
| * read-tree --debug-unpackJunio C Hamano2010-01-07
| * unpack-trees.c: look ahead in the indexJunio C Hamano2010-01-07
| * unpack-trees.c: prepare for looking ahead in the indexJunio C Hamano2010-01-07
| * Aggressive three-way merge: fix D/F caseJunio C Hamano2010-01-03