aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/checkout.c
AgeCommit message (Expand)AuthorFilesLines
4 daysMerge branch 'ps/refs-without-the-repository'Junio C Hamano1-13/+22
13 dayscocci: apply rules to rewrite callers of "refs" interfacesPatrick Steinhardt1-13/+22
2024-04-18builtin: stop using `the_index`Patrick Steinhardt1-44/+43
2024-04-15Merge branch 'gt/add-u-commit-i-pathspec-check'Junio C Hamano1-1/+2
2024-04-12Merge branch 'jc/checkout-detach-wo-tracking-report'Junio C Hamano1-1/+2
2024-04-03revision: optionally record matches with pathspec elementsJunio C Hamano1-1/+2
2024-04-01Merge branch 'pw/checkout-conflict-errorfix'Junio C Hamano1-22/+38
2024-03-30checkout: omit "tracking" information on a detached HEADJunio C Hamano1-1/+2
2024-03-28Merge branch 'eb/hash-transition'Junio C Hamano1-3/+5
2024-03-25Merge branch 'rj/restore-plug-leaks'Junio C Hamano1-30/+21
2024-03-14checkout: plug some leaks in git-restoreRubén Justo1-30/+21
2024-03-14checkout: fix interaction between --conflict and --mergePhillip Wood1-3/+7
2024-03-14checkout: cleanup --conflict=<style> parsingPhillip Wood1-19/+32
2024-03-14merge-ll: introduce LL_MERGE_OPTIONS_INITPhillip Wood1-2/+1
2024-03-07Merge branch 'js/merge-tree-3-trees'Junio C Hamano1-3/+16
2024-02-23Always check `parse_tree*()`'s return valueJohannes Schindelin1-3/+16
2024-02-13add-patch: classify '@' as a synonym for 'HEAD'Ghanshyam Thakkar1-1/+3
2024-01-08Merge branch 'en/header-cleanup'Junio C Hamano1-3/+0
2024-01-02Merge branch 'jc/orphan-unborn'Junio C Hamano1-1/+1
2023-12-27Merge branch 'jc/checkout-B-branch-in-use'Junio C Hamano1-8/+29
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren1-3/+0
2023-12-13checkout: forbid "-B <branch>" from touching a branch used elsewhereJunio C Hamano1-0/+7
2023-12-09config: handle NULL value when parsing non-boolsJeff King1-0/+2
2023-11-24orphan/unborn: fix use of 'orphan' in end-user facing messagesJunio C Hamano1-1/+1
2023-11-23checkout: refactor die_if_checked_out() callerJunio C Hamano1-9/+23
2023-10-02tree-walk: init_tree_desc take an oid to get the hash algorithmEric W. Biederman1-3/+5
2023-10-02Merge branch 'jc/unresolve-removal'Junio C Hamano1-4/+11
2023-07-31checkout: allow "checkout -m path" to unmerge removed pathsJunio C Hamano1-4/+2
2023-07-31checkout/restore: refuse unmerging paths unless checking out of the indexJunio C Hamano1-0/+9
2023-07-25Merge branch 'ah/advise-force-pushing'Junio C Hamano1-1/+1
2023-07-13wt-status: don't show divergence advice when committingAlex Henrie1-1/+1
2023-07-06Merge branch 'gc/config-context'Junio C Hamano1-3/+9
2023-06-28config: add ctx arg to config_fn_tGlen Choo1-3/+9
2023-06-21object-store-ll.h: split this header out of object-store.hElijah Newren1-1/+1
2023-06-21merge-ll: rename from ll-mergeElijah Newren1-1/+1
2023-06-21repository: remove unnecessary include of path.hElijah Newren1-0/+1
2023-06-21read-cache*.h: move declarations for read-cache.c functions from cache.hElijah Newren1-0/+1
2023-06-21preload-index.h: move declarations for preload-index.c from elsewhereElijah Newren1-0/+1
2023-06-21add: modify add_files_to_cache() to avoid globalsElijah Newren1-1/+1
2023-04-24symlinks.h: move declarations for symlinks.c functions from cache.hElijah Newren1-0/+1
2023-04-11object-name.h: move declarations for object-name.c functions from cache.hElijah Newren1-0/+1
2023-04-11treewide: be explicit about dependence on mem-pool.hElijah Newren1-0/+1
2023-04-11treewide: be explicit about dependence on trace.h & trace2.hElijah Newren1-0/+1
2023-04-04Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano1-14/+21
2023-03-28cocci: apply the "refs.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-2/+4
2023-03-28cocci: apply the "commit.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-5/+8
2023-03-28cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-7/+9
2023-03-21setup.h: move declarations for setup.c functions from cache.hElijah Newren1-0/+1
2023-03-21environment.h: move declarations for environment.c functions from cache.hElijah Newren1-0/+1
2023-03-21treewide: be explicit about dependence on gettext.hElijah Newren1-0/+1
2023-03-19Merge branch 'jk/bundle-use-dash-for-stdfiles'Junio C Hamano1-1/+2
2023-03-19Merge branch 'ak/restore-both-incompatible-with-conflicts'Junio C Hamano1-9/+22
2023-03-06parse-options: consistently allocate memory in fix_filename()Jeff King1-1/+2
2023-02-27restore: fault --staged --worktree with merge optsAndy Koppe1-9/+22
2023-02-23cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren1-0/+1
2023-02-06add API: remove run_add_interactive() wrapper functionÆvar Arnfjörð Bjarmason1-5/+7
2023-01-08*: fix typos which duplicate a wordAndrei Rybak1-1/+1
2022-12-26read-tree: add "--super-prefix" option, eliminate globalÆvar Arnfjörð Bjarmason1-1/+1
2022-12-14Merge branch 'ab/various-leak-fixes'Junio C Hamano1-0/+2
2022-11-21built-ins & libs & helpers: add/move destructors, fix leaksÆvar Arnfjörð Bjarmason1-0/+2
2022-11-21cocci: apply "pending" index-compatibility to some "builtin/*.c"Ævar Arnfjörð Bjarmason1-6/+6
2022-11-21cocci & cache.h: apply variable section of "pending" index-compatibilityÆvar Arnfjörð Bjarmason1-23/+23
2022-11-21cocci & cache.h: apply a selection of "pending" index-compatibilityÆvar Arnfjörð Bjarmason1-2/+3
2022-11-21cocci & cache.h: remove rarely used "the_index" compat macrosÆvar Arnfjörð Bjarmason1-2/+2
2022-09-01git-compat-util.h: use "UNUSED", not "UNUSED(var)"Ævar Arnfjörð Bjarmason1-2/+2
2022-08-19mark unused read_tree_recursive() callback parametersJeff King1-1/+1
2022-08-19refs: mark unused each_ref_fn parametersJeff King1-1/+1
2022-08-18Merge branch 'vd/sparse-reset-checkout-fixes'Junio C Hamano1-0/+1
2022-08-08checkout: fix nested sparse directory diff in sparse indexVictoria Dye1-0/+1
2022-08-01Merge branch 'mt/checkout-count-fix'Junio C Hamano1-1/+1
2022-07-14checkout: fix two bugs on the final count of updated entriesMatheus Tavares1-1/+1
2022-07-01checkout: avoid "struct unpack_trees_options" leakÆvar Arnfjörð Bjarmason1-14/+22
2022-06-07Merge branch 'ab/plug-leak-in-revisions'Junio C Hamano1-1/+2
2022-05-20Merge branch 'ep/maint-equals-null-cocci'Junio C Hamano1-1/+1
2022-05-02Merge branch 'ep/maint-equals-null-cocci' for maint-2.35Junio C Hamano1-1/+1
2022-05-02tree-wide: apply equals-null.cocciJunio C Hamano1-1/+1
2022-04-13revisions API users: add straightforward release_revisions()Ævar Arnfjörð Bjarmason1-0/+1
2022-04-13revision.[ch]: provide and start using a release_revisions()Ævar Arnfjörð Bjarmason1-1/+1
2022-03-16Merge branch 'ab/object-file-api-updates'Junio C Hamano1-1/+1
2022-03-13Merge branch 'gc/parse-tree-indirect-errors'Junio C Hamano1-3/+10
2022-03-01checkout, clone: die if tree cannot be parsedGlen Choo1-3/+10
2022-02-25switch: mention the --detach option when dying due to lack of a branchAlex Henrie1-11/+19
2022-02-25object-file API: have write_object_file() take "enum object_type"Ævar Arnfjörð Bjarmason1-1/+1
2022-02-18Merge branch 'js/short-help-outside-repo-fix'Junio C Hamano1-3/+4
2022-02-18Merge branch 'gc/branch-recurse-submodules'Junio C Hamano1-1/+2
2022-02-16Merge branch 'en/remerge-diff'Junio C Hamano1-4/+8
2022-02-09Merge branch 'ab/config-based-hooks-2'Junio C Hamano1-1/+2
2022-02-08checkout/fetch/pull/pack-objects: allow `-h` outside a repositoryJohannes Schindelin1-3/+4
2022-02-02ll-merge: make callers responsible for showing warningsElijah Newren1-4/+8
2022-02-01branch: add a dry_run parameter to create_branch()Glen Choo1-1/+2
2022-01-24Merge branch 'ab/checkout-branch-info-leakfix'Junio C Hamano1-3/+0
2022-01-21checkout: avoid BUG() when hitting a broken repositoryJunio C Hamano1-3/+0
2022-01-20Merge branch 'js/branch-track-inherit'Junio C Hamano1-1/+1
2022-01-20branch,checkout: fix --track documentationRené Scharfe1-1/+1
2022-01-18Merge branch 'js/branch-track-inherit'Junio C Hamano1-3/+3
2022-01-18branch,checkout: fix --track usage stringsJosh Steadmon1-3/+3
2022-01-10Merge branch 'ja/i18n-similar-messages'Junio C Hamano1-9/+9
2022-01-10Merge branch 'js/branch-track-inherit'Junio C Hamano1-2/+4
2022-01-07hooks: convert non-worktree 'post-checkout' hook to hook libraryEmily Shaffer1-1/+2
2022-01-05i18n: turn even more messages into "cannot be used together" onesJean-Noël Avila1-3/+3
2022-01-05i18n: factorize "--foo requires --bar" and the likeJean-Noël Avila1-1/+1
2022-01-05i18n: turn "options are incompatible" into "cannot be used together"Jean-Noël Avila1-4/+4
2022-01-05i18n: refactor "foo and bar are mutually exclusive"Jean-Noël Avila1-1/+1
2021-12-20branch: add flags and config to inherit trackingJosh Steadmon1-2/+4
2021-12-15Merge branch 'en/zdiff3'Junio C Hamano1-1/+1
2021-12-10Merge branch 'hn/create-reflog-simplify'Junio C Hamano1-1/+1
2021-12-01update documentation for new zdiff3 conflictStyleElijah Newren1-1/+1
2021-11-22refs: drop force_create argument of create_reflog APIHan-Wen Nienhuys1-1/+1
2021-11-18checkout: fix "branch info" memory leaksÆvar Arnfjörð Bjarmason1-31/+55
2021-09-27Change unpack_trees' 'reset' flag into an enumElijah Newren1-2/+3
2021-09-27unpack-trees: introduce preserve_ignored to unpack_trees_optionsElijah Newren1-9/+2
2021-09-27checkout, read-tree: fix leak of unpack_trees_options.dirElijah Newren1-0/+4
2021-09-10Merge branch 'ab/retire-advice-config'Junio C Hamano1-3/+3
2021-08-26checkout: make delayed checkout respect --quiet and --no-progressMatheus Tavares1-1/+1
2021-08-25advice: remove read uses of most global `advice_` variablesBen Boeckel1-3/+3
2021-07-14checkout: stop expanding sparse indexesDerrick Stolee1-5/+3
2021-05-16Merge branch 'mt/parallel-checkout-part-3'Junio C Hamano1-4/+18
2021-05-10Merge branch 'bc/hash-transition-interop-part-1'Junio C Hamano1-3/+3
2021-05-07Merge branch 'ah/plugleaks'Junio C Hamano1-0/+1
2021-05-05builtin/checkout.c: complete parallel checkout supportMatheus Tavares1-4/+17
2021-05-05make_transient_cache_entry(): optionally alloc from mem_poolMatheus Tavares1-1/+1
2021-04-30Merge branch 'ds/sparse-index-protections'Junio C Hamano1-0/+5
2021-04-28builtin/checkout: clear pending objects after diffingAndrzej Hunt1-0/+1
2021-04-27hash: provide per-algorithm null OIDsbrian m. carlson1-3/+3
2021-04-14checkout: ensure full indexDerrick Stolee1-0/+5
2021-04-02Merge branch 'mt/parallel-checkout-part-1'Junio C Hamano1-0/+1
2021-03-23entry: extract a header file for entry.c functionsMatheus Tavares1-0/+1
2021-03-20tree.h API: simplify read_tree_recursive() signatureÆvar Arnfjörð Bjarmason1-4/+4
2021-01-23cache-tree: clean up cache_tree_update()Derrick Stolee1-3/+0
2020-12-23Merge branch 'dl/checkout-p-merge-base'Junio C Hamano1-2/+4
2020-12-21checkout -p: handle tree arguments correctly againJohannes Schindelin1-2/+4
2020-11-11Merge branch 'rs/clear-commit-marks-in-repo'Junio C Hamano1-1/+1
2020-10-31object: allow clear_commit_marks_all to handle any repoRené Scharfe1-1/+1
2020-10-27Merge branch 'dl/checkout-guess'Junio C Hamano1-1/+6
2020-10-27Merge branch 'dl/checkout-p-merge-base'Junio C Hamano1-1/+14
2020-10-08checkout: learn to respect checkout.guessDenton Liu1-1/+6
2020-10-07builtin/checkout: fix `git checkout -p HEAD...` bugDenton Liu1-1/+14
2020-09-09Merge branch 'jt/interpret-branch-name-fallback'Junio C Hamano1-2/+2
2020-09-02wt-status: tolerate dangling marksJonathan Tan1-2/+2
2020-08-31Merge branch 'rs/checkout-no-overlay-pathspec-fix'Junio C Hamano1-0/+2
2020-08-27Merge branch 'jk/leakfix'Junio C Hamano1-1/+3
2020-08-22checkout, restore: make pathspec recursiveRené Scharfe1-0/+2
2020-08-14checkout: fix leak of non-existent branch namesJeff King1-1/+3
2020-08-03checkout: support renormalization with checkout -m <paths>Elijah Newren1-5/+6
2020-08-03merge: make merge.renormalize work for all uses of merge machineryElijah Newren1-7/+0
2020-06-08Merge branch 'bc/filter-process'Junio C Hamano1-3/+1
2020-05-24checkout: improve error messages for -b with extra argumentRené Scharfe1-1/+1
2020-05-21builtin/checkout: simplify metadata initializationbrian m. carlson1-3/+1
2020-05-08Merge branch 'es/restore-staged-from-head-by-default'Junio C Hamano1-3/+3
2020-05-08Merge branch 'dl/switch-c-option-in-error-message'Junio C Hamano1-4/+10
2020-05-05restore: default to HEAD when combining --staged and --worktreeEric Sunshine1-3/+3
2020-04-30switch: fix errors and comments related to -c and -CDenton Liu1-4/+10
2020-04-28Use OPT_CALLBACK and OPT_CALLBACK_FDenton Liu1-2/+2
2020-03-16builtin/checkout: compute checkout metadata for checkoutsbrian m. carlson1-4/+14
2020-03-16convert: provide additional metadata to filtersbrian m. carlson1-0/+13
2020-03-12builtin/checkout: pass branch info down to checkout_worktreebrian m. carlson1-16/+17
2020-02-17Merge branch 'rs/strbuf-insertstr'Junio C Hamano1-1/+1
2020-02-10strbuf: add and use strbuf_insertstr()René Scharfe1-1/+1
2020-02-05Merge branch 'am/checkout-file-and-ref-ref-ambiguity'Junio C Hamano1-32/+39
2020-01-22Merge branch 'nd/switch-and-restore'Junio C Hamano1-0/+2
2020-01-08restore: invalidate cache-tree when removing entries with --stagedJeff King1-0/+2
2020-01-07checkout: don't revert file on ambiguous tracking branchesAlexandr Miloslavskiy1-31/+25
2020-01-07parse_branchname_arg(): extract part as new functionAlexandr Miloslavskiy1-6/+19
2019-12-04checkout, restore: support the --pathspec-from-file optionAlexandr Miloslavskiy1-4/+27
2019-10-15Merge branch 'en/merge-recursive-cleanup'Junio C Hamano1-4/+10
2019-09-30Merge branch 'nd/switch-and-restore'Junio C Hamano1-0/+9
2019-09-09Merge branch 'en/checkout-mismerge-fix'Junio C Hamano1-7/+0
2019-08-30checkout: add simple check for 'git checkout -b'Derrick Stolee1-0/+9
2019-08-22Merge branch 'vn/restore-empty-ita-corner-case-fix'Junio C Hamano1-0/+1
2019-08-19cache-tree: share code between functions writing an index as a treeElijah Newren1-1/+1
2019-08-19merge-recursive: remove useless parameter in merge_trees()Elijah Newren1-3/+1
2019-08-16checkout: provide better conflict hunk description with detached HEADElijah Newren1-0/+8
2019-08-16checkout: remove duplicate codeElijah Newren1-7/+0
2019-08-06l10n: reformat some localized strings for v2.23.0Jean-Noël Avila1-1/+1
2019-08-02checkout.c: unstage empty deleted ita filesVarun Naik1-0/+1
2019-07-09Merge branch 'nd/switch-and-restore'Junio C Hamano1-320/+584
2019-06-20switch: allow to switch in the middle of bisectNguyễn Thái Ngọc Duy1-3/+1
2019-05-07restore: support --patchNguyễn Thái Ngọc Duy1-2/+4
2019-05-07restore: replace --force with --ignore-unmergedNguyễn Thái Ngọc Duy1-9/+20
2019-05-07restore: default to --source=HEAD when only --staged is specifiedNguyễn Thái Ngọc Duy1-0/+6
2019-05-07restore: reject invalid combinations with --stagedNguyễn Thái Ngọc Duy1-0/+10
2019-05-07restore: add --worktree and --stagedNguyễn Thái Ngọc Duy1-6/+68
2019-05-07checkout: factor out worktree checkout codeNguyễn Thái Ngọc Duy1-49/+59
2019-05-07restore: disable overlay mode by defaultNguyễn Thái Ngọc Duy1-4/+7
2019-05-07restore: make pathspec mandatoryNguyễn Thái Ngọc Duy1-0/+7
2019-05-07restore: take tree-ish from --source option insteadNguyễn Thái Ngọc Duy1-8/+34
2019-05-07checkout: split part of it to new command 'restore'Nguyễn Thái Ngọc Duy1-0/+26
2019-04-25Merge branch 'nd/checkout-m'Junio C Hamano1-2/+9
2019-04-25Merge branch 'jk/unused-params-even-more'Junio C Hamano1-1/+1
2019-04-16Merge branch 'nd/checkout-m-doc-update'Junio C Hamano1-0/+9
2019-04-02switch: make --orphan switch to an empty treeNguyễn Thái Ngọc Duy1-8/+31
2019-04-02switch: reject if some operation is in progressNguyễn Thái Ngọc Duy1-0/+40
2019-04-02switch: no worktree status unless real branch switch happensNguyễn Thái Ngọc Duy1-126/+8
2019-04-02switch: implicit dwim, use --no-guess to disable itNguyễn Thái Ngọc Duy1-8/+8
2019-04-02switch: add short option for --detachNguyễn Thái Ngọc Duy1-1/+1
2019-04-02switch: only allow explicit detached HEADNguyễn Thái Ngọc Duy1-0/+34
2019-04-02switch: reject "do nothing" caseNguyễn Thái Ngọc Duy1-0/+9
2019-04-02switch: stop accepting pathspecNguyễn Thái Ngọc Duy1-5/+15
2019-04-02switch: remove -lNguyễn Thái Ngọc Duy1-1/+1
2019-04-02switch: add --discard-changesNguyễn Thái Ngọc Duy1-2/+10
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-20 10:22:12 +0000