aboutsummaryrefslogtreecommitdiffstats
path: root/unpack-trees.c
AgeCommit message (Expand)AuthorFilesLines
2016-06-27unpack-trees: fix English grammar in do-this-before-that messagesAlex Henrie1-9/+9
2016-05-17Merge branch 'nd/error-errno'Junio C Hamano1-4/+2
2016-05-17Merge branch 'va/i18n-misc-updates'Junio C Hamano1-20/+54
2016-05-12i18n: unpack-trees: avoid substituting only a verb in sentencesVasco Almeida1-13/+47
2016-05-09unpack-trees.c: use error_errno()Nguyễn Thái Ngọc Duy1-4/+2
2016-04-25struct name_entry: use struct object_id instead of unsigned char sha1[20]brian m. carlson1-2/+2
2016-04-12i18n: unpack-trees: mark strings for translationVasco Almeida1-12/+12
2016-01-22unpack-trees: fix accidentally quadratic behaviorDavid Turner1-1/+12
2016-01-05do_compare_entry: use already-computed pathDavid Turner1-2/+36
2015-09-25replace trivial malloc + sprintf / strcpy calls with xstrfmtJeff King1-3/+1
2015-09-09Sync with 2.5.2Junio C Hamano1-7/+10
2015-09-04Sync with 2.4.9Junio C Hamano1-7/+10
2015-09-04Sync with 2.2.3Junio C Hamano1-7/+10
2015-09-04verify_absent: allow filenames longer than PATH_MAXJeff King1-7/+10
2015-08-19Merge branch 'jk/git-path'Junio C Hamano1-1/+3
2015-08-19Merge branch 'as/sparse-checkout-removal' into maintJunio C Hamano1-0/+4
2015-08-12Merge branch 'dt/unpack-trees-cache-tree-revalidate'Junio C Hamano1-0/+8
2015-08-10prefer git_pathdup to git_path in some possibly-dangerous casesJeff King1-1/+3
2015-08-03Merge branch 'as/sparse-checkout-removal'Junio C Hamano1-0/+4
2015-07-28unpack-trees: populate cache-tree on successful mergeBrian Degenhardt1-0/+8
2015-07-21unpack-trees: don't update files with CE_WT_REMOVE setDavid Turner1-0/+4
2015-03-12untracked cache: invalidate at index addition or removalNguyễn Thái Ngọc Duy1-2/+5
2014-12-18Sync with v2.2.1Junio C Hamano1-4/+6
2014-12-17Sync with v2.0.5Junio C Hamano1-4/+6
2014-12-17Sync with v1.9.5Junio C Hamano1-4/+6
2014-12-17Sync with v1.8.5.6Junio C Hamano1-4/+6
2014-12-17Merge branch 'dotgit-case-maint-1.8.5' into maint-1.8.5Junio C Hamano1-4/+6
2014-12-17unpack-trees: propagate errors adding entries to the indexJeff King1-4/+6
2014-12-12Merge branch 'jc/unpack-trees-plug-leak'Junio C Hamano1-0/+2
2014-11-17unpack_trees: plug leakage of o->resultJunio C Hamano1-0/+2
2014-09-19Merge branch 'jn/unpack-trees-checkout-m-carry-deletion' into maintJunio C Hamano1-21/+10
2014-09-11Merge branch 'jn/unpack-trees-checkout-m-carry-deletion'Junio C Hamano1-21/+10
2014-08-25checkout -m: attempt merge when deletion of path was stagedJonathan Nieder1-5/+6
2014-08-13unpack-trees: use 'cuddled' style for if-else cascadeJonathan Nieder1-8/+4
2014-08-13unpack-trees: simplify 'all other failures' caseStefan Beller1-10/+2
2014-07-16Merge branch 'nd/split-index'Junio C Hamano1-3/+15
2014-07-09Merge branch 'jk/xstrfmt'Junio C Hamano1-11/+6
2014-06-20cleanup duplicate name_compare() functionsJeremiah Mahler1-11/+0
2014-06-19use xstrfmt in favor of manual size calculationsJeff King1-11/+6
2014-06-13read-cache: mark updated entries for split indexNguyễn Thái Ngọc Duy1-1/+3
2014-06-13read-cache: split-index modeNguyễn Thái Ngọc Duy1-0/+4
2014-06-13read-cache: save index SHA-1 after readingNguyễn Thái Ngọc Duy1-0/+1
2014-06-13entry.c: update cache_changed if refresh_cache is set in checkout_entry()Nguyễn Thái Ngọc Duy1-0/+1
2014-06-13cache-tree: mark istate->cache_changed on cache tree invalidationNguyễn Thái Ngọc Duy1-1/+1
2014-06-13unpack-trees: be specific what part of the index has changedNguyễn Thái Ngọc Duy1-2/+6
2014-03-14Merge branch 'nd/i18n-progress'Junio C Hamano1-1/+1
2014-02-27Merge branch 'kb/fast-hashmap'Junio C Hamano1-2/+1
2014-02-24i18n: mark all progress lines for translationNguyễn Thái Ngọc Duy1-1/+1
2013-12-17Merge branch 'jk/two-way-merge-corner-case-fix' into maintJunio C Hamano1-8/+17
2013-12-16Prevent buffer overflows when path is too longAntoine Pelisse1-24/+27
2013-12-05Merge branch 'jk/two-way-merge-corner-case-fix'Junio C Hamano1-8/+17
2013-11-18name-hash.c: remove cache entries instead of marking them CE_UNHASHEDKarsten Blees1-1/+1
2013-11-18name-hash.c: use new hash map implementation for cache entriesKarsten Blees1-1/+0
2013-11-04unpack-trees: fix "read-tree -u --reset A B" with conflicted indexJeff King1-8/+17
2013-09-17employ new explicit "exists in index?" APIEric Sunshine1-2/+2
2013-08-13unpack-trees: plug a memory leakFelipe Contreras1-1/+3
2013-07-09Convert "struct cache_entry *" to "const ..." wherever possibleNguyễn Thái Ngọc Duy1-7/+7
2013-06-24Merge branch 'rs/unpack-trees-tree-walk-conflict-field'Junio C Hamano1-15/+3
2013-06-17unpack-trees: don't shift conflicts left and rightRené Scharfe1-15/+3
2013-06-02unpack-trees: free cache_entry array members for mergesRené Scharfe1-3/+10
2013-06-02diff-lib, read-tree, unpack-trees: mark cache_entry array paramters constRené Scharfe1-8/+13
2013-06-02diff-lib, read-tree, unpack-trees: mark cache_entry pointers constRené Scharfe1-41/+50
2013-06-02unpack-trees: create working copy of merge entry in merged_entryRené Scharfe1-5/+12
2013-06-02unpack-trees: factor out dup_entryRené Scharfe1-3/+9
2013-04-15dir.c: replace is_path_excluded with now equivalent is_excluded APIKarsten Blees1-9/+1
2013-01-23Merge branch 'as/check-ignore'Junio C Hamano1-1/+1
2013-01-10Merge branch 'as/dir-c-cleanup'Junio C Hamano1-5/+7
2013-01-06dir.c: use a single struct exclude_list per source of excludesAdam Spiers1-1/+1
2012-12-28dir.c: rename free_excludes() to clear_exclude_list()Adam Spiers1-1/+1
2012-12-28dir.c: rename excluded_from_list() to is_excluded_from_list()Adam Spiers1-3/+5
2012-12-28dir.c: rename path_excluded() to is_path_excluded()Adam Spiers1-1/+1
2012-12-20oneway_merge(): only lstat() when told to update worktreeMartin von Zweigbergk1-1/+1
2012-07-23Merge branch 'tg/ce-namelen-field'Junio C Hamano1-1/+2
2012-07-11Merge branch 'jc/ls-files-i-dir' into maintJunio C Hamano1-1/+10
2012-07-11Strip namelen out of ce_flags into a ce_namelen fieldThomas Gummerer1-1/+2
2012-07-08Replace strlen() with ce_namelen()Thomas Gummerer1-1/+1
2012-06-21Merge branch 'jc/ls-files-i-dir'Junio C Hamano1-1/+10
2012-06-05unpack-trees.c: use path_excluded() in check_ok_to_remove()Junio C Hamano1-1/+10
2012-05-20Merge branch 'maint'Junio C Hamano1-1/+1
2012-05-20Consistently use "superproject" instead of "supermodule"Jens Lehmann1-1/+1
2012-05-02Merge branch 'pw/message-cleanup'Junio C Hamano1-1/+1
2012-05-02Merge branch 'jc/index-v4'Junio C Hamano1-0/+1
2012-04-30remove superfluous newlines in error messagesPete Wyckoff1-1/+1
2012-04-27unpack-trees: preserve the index file version of originalJunio C Hamano1-0/+1
2012-04-10unpack-trees: plug minor memory leakRené Scharfe1-9/+16
2012-04-10unpack-trees: don't perform any index operation if we're not mergingRené Scharfe1-1/+1
2011-10-27tree-walk.c: do not leak internal structure in tree_entry_len()Nguyễn Thái Ngọc Duy1-3/+3
2011-10-13Merge branch 'nd/maint-sparse-errors'Junio C Hamano1-4/+16
2011-10-05Merge branch 'mg/maint-doc-sparse-checkout'Junio C Hamano1-1/+1
2011-10-05Merge branch 'jc/diff-index-unpack'Junio C Hamano1-0/+2
2011-09-22Add explanation why we do not allow to sparse checkout to empty working treeNguyễn Thái Ngọc Duy1-1/+6
2011-09-22sparse checkout: show error messages when worktree shaping failsNguyễn Thái Ngọc Duy1-3/+10
2011-09-21unpack-trees: print "Aborting" to stderrMichael J Gruber1-1/+1
2011-08-29unpack-trees: allow pruning with pathspecJunio C Hamano1-0/+2
2011-07-31Merge branch 'maint'Junio C Hamano1-2/+13
2011-07-31Break down no-lstat() condition checks in verify_uptodate()Nguyễn Thái Ngọc Duy1-2/+13
2011-06-29Merge branch 'jc/diff-index-quick-exit-early'Junio C Hamano1-1/+3
2011-05-31diff-index --quiet: learn the "stop feeding the backend early" logicJunio C Hamano1-1/+3
2011-05-25unpack-trees: add the dry_run flag to unpack_trees_optionsJens Lehmann1-2/+2
2011-05-10sparse checkout: do not eagerly decide the fate for whole directoryNguyễn Thái Ngọc Duy1-29/+34
2011-03-22Fix sparse warningsStephen Boyd1-1/+1
2011-02-15Revert "unpack_trees(): skip trees that are the same in all input"Junio C Hamano1-56/+0
2011-02-09Merge branch 'jc/unpack-trees'Junio C Hamano1-2/+62
2011-02-09Merge branch 'jn/unpack-lstat-failure-report'Junio C Hamano1-6/+12
2011-01-13unpack-trees: handle lstat failure for existing fileJonathan Nieder1-1/+3
2011-01-13unpack-trees: handle lstat failure for existing directoryJonathan Nieder1-5/+9
2011-01-04unpack_trees(): skip trees that are the same in all inputJunio C Hamano1-0/+56
2010-12-22Merge branch 'nd/maint-fix-add-typo-detection'Junio C Hamano1-23/+217
2010-12-22unpack-trees.c: cosmetic fixJunio C Hamano1-4/+8
2010-12-14use persistent memory for rejected pathsClemens Buchacher1-25/+11
2010-12-14do not overwrite files in leading pathClemens Buchacher1-3/+13
2010-12-14add function check_ok_to_remove()Clemens Buchacher1-49/+58
2010-11-30unpack-trees: fix sparse checkout's "unable to match directories"Nguyễn Thái Ngọc Duy1-10/+144
2010-11-29unpack-trees: move all skip-worktree checks back to unpack_trees()Nguyễn Thái Ngọc Duy1-9/+73
2010-11-29dir.c: add free_excludes()Nguyễn Thái Ngọc Duy1-5/+1
2010-11-15use persistent memory for rejected pathsClemens Buchacher1-25/+11
2010-10-13do not overwrite files in leading pathClemens Buchacher1-3/+13
2010-10-13add function check_ok_to_remove()Clemens Buchacher1-49/+58
2010-09-03Merge branch 'dg/local-mod-error-messages'Junio C Hamano1-7/+49
2010-09-03Move "show_all_errors = 1" to setup_unpack_trees_porcelain()Matthieu Moy1-6/+2
2010-09-03setup_unpack_trees_porcelain: take the whole options struct as parameterMatthieu Moy1-1/+3
2010-09-03Move set_porcelain_error_msgs to unpack-trees.c and rename itMatthieu Moy1-1/+45
2010-08-21Merge branch 'nd/fix-sparse-checkout'Junio C Hamano1-25/+31
2010-08-21Merge branch 'dg/local-mod-error-messages'Junio C Hamano1-41/+124
2010-08-11unpack_trees: group error messages by typeMatthieu Moy1-4/+74
2010-08-11merge-recursive: distinguish "removed" and "overwritten" messagesMatthieu Moy1-25/+39
2010-08-11merge-recursive: porcelain messages for checkoutDiane Gasselin1-3/+2
2010-08-11Turn unpack_trees_options.msgs into an array + enumMatthieu Moy1-21/+21
2010-08-11read-tree: stop leaking tree objectsJonathan Nieder1-1/+6
2010-08-09unpack-trees: mark new entries skip-worktree appropriatelyNguyễn Thái Ngọc Duy1-0/+2
2010-08-09unpack-trees: do not check for conflict entries too earlyNguyễn Thái Ngọc Duy1-4/+1
2010-08-09unpack-trees: let read-tree -u remove index entries outside sparse areaNguyễn Thái Ngọc Duy1-10/+19
2010-08-09unpack-trees: only clear CE_UPDATE|CE_REMOVE when skip-worktree is always setNguyễn Thái Ngọc Duy1-14/+12
2010-06-22Merge branch 'bd/maint-unpack-trees-parawalk-fix'Junio C Hamano1-2/+10
2010-06-21Merge branch 'gv/portable'Junio C Hamano1-1/+3
2010-06-18unpack-trees: Make index lookahead less pessimalBrian Downing1-2/+10
2010-06-13Merge branch 'cb/assume-unchanged-fix'Junio C Hamano1-1/+1
2010-05-31Rewrite dynamic structure initializations to runtime assignmentGary V. Vaughan1-1/+3
2010-05-01do not overwrite files marked "assume unchanged"Clemens Buchacher1-1/+1
2010-03-28Introduce remove_or_warn functionPeter Collingbourne1-10/+2
2010-01-24Merge branch 'jc/fix-tree-walk'Junio C Hamano1-58/+331
2010-01-18Merge branch 'pc/uninteresting-submodule-disappear-upon-switch-branches'Junio C Hamano1-2/+10
2010-01-13Merge branch 'cc/reset-more'Junio C Hamano1-7/+14
2010-01-13Merge branch 'nd/sparse'Junio C Hamano1-18/+163
2010-01-11Remove empty directories when checking out a commit with fewer submodulesPeter Collingbourne1-2/+10
2010-01-07read-tree --debug-unpackJunio C Hamano1-0/+35
2010-01-07unpack-trees.c: look ahead in the indexJunio C Hamano1-3/+117
2010-01-07unpack-trees.c: prepare for looking ahead in the indexJunio C Hamano1-46/+170
2010-01-03Aggressive three-way merge: fix D/F caseJunio C Hamano1-5/+8
2010-01-03"reset --merge": fix unmerged caseJunio C Hamano1-7/+14
2009-12-14ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALIDNguyễn Thái Ngọc Duy1-3/+3
2009-11-20Merge branch 'jc/fix-tree-walk' (early part)Junio C Hamano1-13/+13
2009-10-24Use 'fast-forward' all over the placeFelipe Contreras1-1/+1
2009-10-11unpack_callback(): use unpack_failed() consistentlyJunio C Hamano1-12/+12
2009-10-11unpack-trees: typofixJunio C Hamano1-1/+1
2009-08-23sparse checkout: inhibit empty worktreeNguyễn Thái Ngọc Duy1-0/+7
2009-08-23unpack-trees(): ignore worktree check outside checkout areaNguyễn Thái Ngọc Duy1-0/+12
2009-08-23unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final indexNguyễn Thái Ngọc Duy1-1/+81
2009-08-23unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkoutNguyễn Thái Ngọc Duy1-6/+30
2009-08-23unpack-trees.c: generalize verify_* functionsNguyễn Thái Ngọc Duy1-5/+18
2009-08-23unpack-trees(): add CE_WT_REMOVE to remove on worktree aloneNguyễn Thái Ngọc Duy1-1/+8
2009-08-23unpack-trees(): carry skip-worktree bit over in merged_entry()Nguyễn Thái Ngọc Duy1-0/+2
2009-08-23Teach Git to respect skip-worktree bit (writing part)Nguyễn Thái Ngọc Duy1-2/+2
2009-07-18Merge branch 'maint'Junio C Hamano1-1/+1
2009-07-18checkout -f: deal with a D/F conflict entry correctlyJunio C Hamano1-1/+1
2009-07-14Fix extraneous lstat's in 'git checkout -f'Linus Torvalds1-1/+1
2009-07-10unpack-trees.c: work around run-time array initialization flaw on IRIX 6.5Brandon Casey1-1/+1
2009-07-09Simplify read_directory[_recursive]() argumentsLinus Torvalds1-1/+1
2009-06-20Fix various sparse warnings in the git source codeLinus Torvalds1-1/+1
2009-05-25Optimize "diff-index --cached" using cache-treeJunio C Hamano1-0/+17
2009-04-29replace direct calls to unlink(2) with unlink_or_warnAlex Riesen1-1/+1
2009-04-17unpack-trees: do not muck with attributes when we are not checking outJunio C Hamano1-2/+4
2009-03-26Merge branch 'jc/attributes-checkout'Junio C Hamano1-0/+3
2009-03-17Merge branch 'jc/maint-1.6.0-read-tree-overlay'Junio C Hamano1-3/+3
2009-03-13Read attributes from the index that is being checked outJunio C Hamano1-0/+3
2009-03-12read-tree A B C: do not create a bogus index and do not segfaultJunio C Hamano1-3/+3
2009-03-07Record ns-timestamps if possible, but do not use it without USE_NSECKjetil Barvik1-2/+0
2009-02-19verify_uptodate(): add ce_uptodate(ce) testKjetil Barvik1-1/+1
2009-02-19make USE_NSEC work as expectedKjetil Barvik1-2/+6
2009-02-18check_updates(): effective removal of cache entries marked CE_REMOVEKjetil Barvik1-3/+1
2009-02-09unlink_entry(): introduce schedule_dir_for_removal()Kjetil Barvik1-24/+6
2009-02-09lstat_cache(): swap func(length, string) into func(string, length)Kjetil Barvik1-2/+2
2009-01-31Merge branch 'maint'Junio C Hamano1-3/+6
2009-01-31Merge branch 'maint-1.6.0' into maintJunio C Hamano1-3/+6
2009-01-31merge: fix out-of-bounds memory accessRené Scharfe1-3/+6
2009-01-25Merge branch 'kb/lstat-cache'Junio C Hamano1-2/+2
2009-01-23Merge branch 'cb/maint-unpack-trees-absense' into maintJunio C Hamano1-18/+16
2009-01-18lstat_cache(): introduce has_symlink_or_noent_leading_path() functionKjetil Barvik1-2/+2
2009-01-13Merge branch 'cb/maint-unpack-trees-absense'Junio C Hamano1-18/+16
2009-01-05unpack-trees: remove redundant path search in verify_absentClemens Buchacher1-6/+2
2009-01-05unpack-trees: fix path search bug in verify_absentClemens Buchacher1-10/+10
2009-01-05unpack-trees: handle failure in verify_absentClemens Buchacher1-3/+5
2008-11-11Fix non-literal format in printf-style callsDaniel Lowe1-1/+1
2008-11-01correct cache_entry allocationJeff King1-1/+1
2008-09-09checkout: do not lose staged removalJunio C Hamano1-1/+10
2008-08-23unpack_trees(): protect the handcrafted in-core index from read_cache()Junio C Hamano1-0/+1
2008-05-29unpack_trees(): allow callers to differentiate worktree errors from merge errorsJunio C Hamano1-3/+7
2008-05-19unpack-trees: allow Porcelain to give different error messagesJunio C Hamano1-14/+41
2008-05-10Optimize symlink/directory detectionLinus Torvalds1-7/+5
2008-04-09Make unpack-tree update removed files before any updated filesLinus Torvalds1-2/+7
generated by cgit 1.2.3-korg (git 2.43.0) at 2025-12-05 03:34:02 +0000