summaryrefslogtreecommitdiff
path: root/unpack-trees.c
AgeCommit message (Expand)AuthorFilesLines
2017-02-03Merge branch 'sb/unpack-trees-super-prefix'Libravatar Junio C Hamano1-3/+40
2017-01-25unpack-trees: support super-prefix optionLibravatar Stefan Beller1-3/+40
2017-01-18Merge branch 'sb/unpack-trees-cleanup'Libravatar Junio C Hamano1-23/+30
2017-01-10unpack-trees: factor progress setup out of check_updatesLibravatar Stefan Beller1-12/+20
2017-01-10unpack-trees: remove unneeded continueLibravatar Stefan Beller1-1/+0
2017-01-10unpack-trees: move checkout state into check_updatesLibravatar Stefan Beller1-12/+12
2016-12-19Merge branch 'sb/unpack-trees-grammofix'Libravatar Junio C Hamano1-1/+1
2016-12-05unpack-trees: fix grammar for untracked files in directoriesLibravatar Stefan Beller1-1/+1
2016-09-22introduce CHECKOUT_INITLibravatar René Scharfe1-3/+1
2016-09-21Merge branch 'rs/unpack-trees-reduce-file-scope-global'Libravatar Junio C Hamano1-4/+5
2016-09-19Merge branch 'bc/object-id'Libravatar Junio C Hamano1-4/+4
2016-09-13unpack-trees: pass checkout state explicitly to check_updates()Libravatar René Scharfe1-4/+5
2016-09-08unpack-trees: do not capitalize "working"Libravatar Alex Henrie1-2/+2
2016-09-07cache: convert struct cache_entry to use struct object_idLibravatar brian m. carlson1-4/+4
2016-06-27unpack-trees: fix English grammar in do-this-before-that messagesLibravatar Alex Henrie1-9/+9
2016-05-17Merge branch 'nd/error-errno'Libravatar Junio C Hamano1-4/+2
2016-05-17Merge branch 'va/i18n-misc-updates'Libravatar Junio C Hamano1-20/+54
2016-05-12i18n: unpack-trees: avoid substituting only a verb in sentencesLibravatar Vasco Almeida1-13/+47
2016-05-09unpack-trees.c: use error_errno()Libravatar Nguyễn Thái Ngọc Duy1-4/+2
2016-04-25struct name_entry: use struct object_id instead of unsigned char sha1[20]Libravatar brian m. carlson1-2/+2
2016-04-12i18n: unpack-trees: mark strings for translationLibravatar Vasco Almeida1-12/+12
2016-01-22unpack-trees: fix accidentally quadratic behaviorLibravatar David Turner1-1/+12
2016-01-05do_compare_entry: use already-computed pathLibravatar David Turner1-2/+36
2015-09-25replace trivial malloc + sprintf / strcpy calls with xstrfmtLibravatar Jeff King1-3/+1
2015-09-09Sync with 2.5.2Libravatar Junio C Hamano1-7/+10
2015-09-04Sync with 2.4.9Libravatar Junio C Hamano1-7/+10
2015-09-04Sync with 2.2.3Libravatar Junio C Hamano1-7/+10
2015-09-04verify_absent: allow filenames longer than PATH_MAXLibravatar Jeff King1-7/+10
2015-08-19Merge branch 'jk/git-path'Libravatar Junio C Hamano1-1/+3
2015-08-19Merge branch 'as/sparse-checkout-removal' into maintLibravatar Junio C Hamano1-0/+4
2015-08-12Merge branch 'dt/unpack-trees-cache-tree-revalidate'Libravatar Junio C Hamano1-0/+8
2015-08-10prefer git_pathdup to git_path in some possibly-dangerous casesLibravatar Jeff King1-1/+3
2015-08-03Merge branch 'as/sparse-checkout-removal'Libravatar Junio C Hamano1-0/+4
2015-07-28unpack-trees: populate cache-tree on successful mergeLibravatar Brian Degenhardt1-0/+8
2015-07-21unpack-trees: don't update files with CE_WT_REMOVE setLibravatar David Turner1-0/+4
2015-03-12untracked cache: invalidate at index addition or removalLibravatar Nguyễn Thái Ngọc Duy1-2/+5
2014-12-18Sync with v2.2.1Libravatar Junio C Hamano1-4/+6
2014-12-17Sync with v2.0.5Libravatar Junio C Hamano1-4/+6
2014-12-17Sync with v1.9.5Libravatar Junio C Hamano1-4/+6
2014-12-17Sync with v1.8.5.6Libravatar Junio C Hamano1-4/+6
2014-12-17Merge branch 'dotgit-case-maint-1.8.5' into maint-1.8.5Libravatar Junio C Hamano1-4/+6
2014-12-17unpack-trees: propagate errors adding entries to the indexLibravatar Jeff King1-4/+6
2014-12-12Merge branch 'jc/unpack-trees-plug-leak'Libravatar Junio C Hamano1-0/+2
2014-11-17unpack_trees: plug leakage of o->resultLibravatar Junio C Hamano1-0/+2
2014-09-19Merge branch 'jn/unpack-trees-checkout-m-carry-deletion' into maintLibravatar Junio C Hamano1-21/+10
2014-09-11Merge branch 'jn/unpack-trees-checkout-m-carry-deletion'Libravatar Junio C Hamano1-21/+10
2014-08-25checkout -m: attempt merge when deletion of path was stagedLibravatar Jonathan Nieder1-5/+6
2014-08-13unpack-trees: use 'cuddled' style for if-else cascadeLibravatar Jonathan Nieder1-8/+4
2014-08-13unpack-trees: simplify 'all other failures' caseLibravatar Stefan Beller1-10/+2
2014-07-16Merge branch 'nd/split-index'Libravatar Junio C Hamano1-3/+15