aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/checkout.c
AgeCommit message (Expand)AuthorFilesLines
2018-09-17Merge branch 'jk/cocci'Junio C Hamano1-1/+1
2018-09-17Merge branch 'bp/checkout-new-branch-optim'Junio C Hamano1-4/+116
2018-08-29convert "oidcmp() == 0" to oideq()Jeff King1-1/+1
2018-08-20Merge branch 'nd/no-the-index'Junio C Hamano1-1/+1
2018-08-16checkout: optimize "git checkout -b <new_branch>"Ben Peart1-4/+116
2018-08-15Merge branch 'nd/i18n'Junio C Hamano1-2/+2
2018-08-13dir.c: remove an implicit dependency on the_index in pathspec codeNguyễn Thái Ngọc Duy1-1/+1
2018-08-02Merge branch 'jm/cache-entry-from-mem-pool'Junio C Hamano1-4/+4
2018-08-02Merge branch 'sb/object-store-lookup'Junio C Hamano1-3/+3
2018-08-02Merge branch 'ab/checkout-default-remote'Junio C Hamano1-8/+33
2018-07-23Update messages in preparation for i18nNguyễn Thái Ngọc Duy1-2/+2
2018-07-18Merge branch 'sb/object-store-grafts'Junio C Hamano1-0/+1
2018-07-03block alloc: add lifecycle APIs for cache_entry structsJameson Miller1-4/+4
2018-07-03read-cache: teach make_cache_entry to take object_idJameson Miller1-1/+1
2018-06-29commit: add repository argument to lookup_commit_reference_gentlyStefan Beller1-3/+3
2018-06-29Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano1-0/+1
2018-06-28Merge branch 'nd/completion-negation'Junio C Hamano1-4/+6
2018-06-11checkout & worktree: introduce checkout.defaultRemoteÆvar Arnfjörð Bjarmason1-3/+9
2018-06-11checkout: add advice for ambiguous "checkout <branch>"Ævar Arnfjörð Bjarmason1-0/+13
2018-06-11builtin/checkout.c: use "ret" variable for returnÆvar Arnfjörð Bjarmason1-3/+5
2018-06-11checkout: pass the "num_matches" up to callersÆvar Arnfjörð Bjarmason1-3/+7
2018-05-30Merge branch 'ma/unpack-trees-free-msgs'Junio C Hamano1-0/+1
2018-05-29completion: suppress some -no- optionsNguyễn Thái Ngọc Duy1-4/+6
2018-05-23Merge branch 'ds/lazy-load-trees'Junio C Hamano1-6/+12
2018-05-22unpack_trees_options: free messages when doneMartin Ågren1-0/+1
2018-05-16object-store: move object access functions to object-store.hStefan Beller1-0/+1
2018-04-11treewide: replace maybe_tree with accessor methodsDerrick Stolee1-6/+12
2018-04-11treewide: rename tree to maybe_treeDerrick Stolee1-6/+6
2018-04-11Merge branch 'bw/c-plus-plus' into ds/lazy-load-treesJunio C Hamano1-98/+98
2018-04-10Merge branch 'bc/object-id'Junio C Hamano1-6/+6
2018-03-14Merge branch 'nd/parseopt-completion'Junio C Hamano1-2/+5
2018-03-14Convert find_unique_abbrev* to struct object_idbrian m. carlson1-3/+3
2018-03-14strbuf: convert strbuf_add_unique_abbrev to use struct object_idbrian m. carlson1-1/+1
2018-03-14tree: convert read_tree_recursive to struct object_idbrian m. carlson1-2/+2
2018-03-08Merge branch 'jh/status-no-ahead-behind'Junio C Hamano1-1/+1
2018-03-06Merge branch 'bw/c-plus-plus'Junio C Hamano1-98/+98
2018-02-22checkout: rename 'new' variablesBrandon Williams1-98/+98
2018-02-09completion: use __gitcomp_builtin in _git_checkoutNguyễn Thái Ngọc Duy1-2/+5
2018-02-09parse-options: let OPT__FORCE take optional flags argumentNguyễn Thái Ngọc Duy1-1/+1
2018-01-30sha1_file: convert write_sha1_file to object_idPatryk Obara1-2/+1
2018-01-24status: support --no-ahead-behind in long formatJeff Hostetler1-1/+1
2018-01-23Merge branch 'rs/lose-leak-pending'Junio C Hamano1-12/+1
2017-12-28checkout: avoid using the rev_info flag leak_pendingRené Scharfe1-12/+1
2017-12-27Merge branch 'ks/branch-cleanup'Junio C Hamano1-1/+1
2017-12-19Merge branch 'ar/unconfuse-three-dots'Junio C Hamano1-2/+8
2017-12-19Merge branch 'tg/worktree-create-tracking'Junio C Hamano1-40/+1
2017-12-13Merge branch 'bc/hash-algo'Junio C Hamano1-1/+1
2017-12-07branch: group related arguments of create_branch()Kaartic Sivaraam1-1/+1
2017-12-06checkout: describe_detached_head: remove ellipsis after committishAnn T Ropea1-2/+8
2017-11-28Merge branch 'jc/branch-name-sanity'Junio C Hamano1-5/+5
2017-11-27checkout: factor out functions to new lib fileThomas Gummerer1-40/+1
2017-11-15Merge branch 'mh/tidy-ref-update-flags'Junio C Hamano1-1/+1
2017-11-13Switch empty tree and blob lookups to use hash abstractionbrian m. carlson1-1/+1
2017-11-06Merge branch 'bc/object-id'Junio C Hamano1-5/+5
2017-11-06Merge branch 'ma/lockfile-fixes'Junio C Hamano1-8/+6
2017-11-06refs: rename constant `REF_NODEREF` to `REF_NO_DEREF`Michael Haggerty1-1/+1
2017-10-16refs: convert read_ref and read_ref_full to object_idbrian m. carlson1-3/+3
2017-10-16refs: convert resolve_refdup and refs_resolve_refdup to struct object_idbrian m. carlson1-1/+1
2017-10-16refs: convert update_ref and refs_update_ref to use struct object_idbrian m. carlson1-1/+1
2017-10-13branch: split validate_new_branchname() into twoJunio C Hamano1-5/+5
2017-10-07Merge branch 'ma/builtin-unleak'Junio C Hamano1-0/+1
2017-10-06treewide: prefer lockfiles on the stackMartin Ågren1-8/+6
2017-10-05Merge branch 'rs/resolve-ref-optional-result'Junio C Hamano1-2/+1
2017-10-02builtin/: add UNLEAKsMartin Ågren1-0/+1
2017-10-01refs: pass NULL to resolve_refdup() if hash is not neededRené Scharfe1-2/+1
2017-09-29Merge branch 'ma/leakplugs'Junio C Hamano1-1/+8
2017-09-24leak_pending: use `object_array_clear()`, not `free()`Martin Ågren1-1/+8
2017-09-22consistently use "fallthrough" comments in switchesJeff King1-0/+1
2017-08-26Merge branch 'bw/submodule-config-cleanup'Junio C Hamano1-2/+1
2017-08-11Merge branch 'ls/filter-process-delayed'Junio C Hamano1-0/+3
2017-08-03submodule: remove gitmodules_configBrandon Williams1-1/+0
2017-08-03unpack-trees: don't respect submodule.updateBrandon Williams1-1/+1
2017-07-26Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshakeJunio C Hamano1-0/+3
2017-06-30convert: add "status=delayed" to filter process protocolLars Schneider1-0/+3
2017-06-24Merge branch 'bw/config-h'Junio C Hamano1-0/+1
2017-06-15config: don't include config.h by defaultBrandon Williams1-0/+1
2017-06-13Merge branch 'sb/submodule-blanket-recursive'Junio C Hamano1-28/+3
2017-06-01Introduce 'submodule.recurse' option for worktree manipulatorsStefan Beller1-1/+1
2017-05-30reset/checkout/read-tree: unify config callback for submodule recursionStefan Beller1-26/+1
2017-05-30submodule recursing: do not write a config variable twiceStefan Beller1-1/+1
2017-05-29Merge branch 'ja/do-not-ask-needless-questions'Junio C Hamano1-3/+2
2017-05-29Merge branch 'js/plug-leaks'Junio C Hamano1-8/+10
2017-05-29Merge branch 'bc/object-id'Junio C Hamano1-9/+9
2017-05-23Merge branch 'rs/checkout-am-fix-unborn'Junio C Hamano1-1/+2
2017-05-12usability: don't ask questions if no reply is requiredJean-Noel Avila1-3/+2
2017-05-09checkout: fix memory leakJunio C Hamano1-0/+1
2017-05-08tree: convert parse_tree_indirect to struct object_idbrian m. carlson1-4/+4
2017-05-08revision: rename add_pending_sha1 to add_pending_oidbrian m. carlson1-2/+2
2017-05-08Convert lookup_commit* to struct object_idbrian m. carlson1-3/+3
2017-05-08checkout: fix memory leakJohannes Schindelin1-8/+9
2017-05-08checkout: check return value of resolve_refdup before using hashRené Scharfe1-1/+2
2017-03-30avoid using fixed PATH_MAX buffers for refsJeff King1-3/+2
2017-03-28Merge branch 'sb/checkout-recurse-submodules'Junio C Hamano1-0/+28
2017-03-28Merge branch 'jk/interpret-branch-name' into maintJunio C Hamano1-1/+1
2017-03-16builtin/checkout: add --recurse-submodules switchStefan Beller1-0/+28
2017-03-14Merge branch 'jk/interpret-branch-name'Junio C Hamano1-1/+1
2017-03-02checkout: restrict @-expansions when finding branchJeff King1-1/+1
2017-03-02interpret_branch_name: allow callers to restrict expansionsJeff King1-1/+1
2017-02-03Merge branch 'cw/log-updates-for-all-refs-really'Junio C Hamano1-4/+7
2017-01-31refs: add option core.logAllRefUpdates = alwaysCornelius Weig1-4/+7
2017-01-30checkout: convert post_checkout_hook() to struct object_idRené Scharfe1-2/+2
2016-12-07hold_locked_index(): align error handling with hold_lockfile_for_update()Junio C Hamano1-2/+2
2016-11-17Merge branch 'jk/create-branch-remove-unused-param'Junio C Hamano1-1/+1
2016-11-09create_branch: drop unused "head" parameterJeff King1-1/+1
2016-09-26Merge branch 'rs/checkout-init-macro'Junio C Hamano1-2/+1
2016-09-26Merge branch 'tg/add-chmod+x-fix'Junio C Hamano1-1/+1
2016-09-26Merge branch 'nd/checkout-disambiguation'Junio C Hamano1-3/+3
2016-09-22introduce CHECKOUT_INITRené Scharfe1-2/+1
2016-09-21Merge branch 'rs/checkout-some-states-are-const'Junio C Hamano1-3/+3
2016-09-21checkout: fix ambiguity check in subdirNguyễn Thái Ngọc Duy1-2/+2
2016-09-15add: modify already added files when --chmod is givenThomas Gummerer1-1/+1
2016-09-13checkout: constify parameters of checkout_stage() and checkout_merged()René Scharfe1-3/+3
2016-09-08Merge branch 'rs/use-strbuf-add-unique-abbrev' into maintJunio C Hamano1-2/+1
2016-09-08checkout: add some spaces between code and commentNguyễn Thái Ngọc Duy1-1/+1
2016-09-07sha1_name: convert get_sha1_mb to struct object_idbrian m. carlson1-1/+1
2016-09-07Convert read_mmblob to take struct object_id.brian m. carlson1-3/+3
2016-09-07builtin/checkout: convert some static functions to struct object_idbrian m. carlson1-33/+33
2016-09-07cache: convert struct cache_entry to use struct object_idbrian m. carlson1-3/+3
2016-08-19Merge branch 'sb/checkout-explit-detach-no-advice'Junio C Hamano1-1/+2
2016-08-15checkout: do not mention detach advice for explicit --detach optionStefan Beller1-1/+2
2016-08-12Merge branch 'rs/use-strbuf-add-unique-abbrev'Junio C Hamano1-2/+1
2016-08-06use strbuf_add_unique_abbrev() for adding short hashesRené Scharfe1-2/+1
2016-08-01merge_trees(): ensure that the callers release output bufferJohannes Schindelin1-0/+1
2016-07-26prepare the builtins for a libified merge_recursive()Johannes Schindelin1-1/+3
2016-07-13Merge branch 'va/i18n-even-more'Junio C Hamano1-3/+3
2016-06-17i18n: standardise messagesVasco Almeida1-3/+3
2016-06-07add: add --chmod=+x / --chmod=-x optionsEdward Thomson1-1/+1
2016-05-23Merge branch 'nd/worktree-various-heads'Junio C Hamano1-1/+1
2016-04-22worktree.c: check whether branch is rebased in another worktreeNguyễn Thái Ngọc Duy1-1/+1
2016-04-10checkout_paths(): remove unneeded flag variableMichael Haggerty1-2/+1
2016-02-29builtin/checkout.c: mark strings for translationNguyễn Thái Ngọc Duy1-1/+1
2016-02-24Merge branch 'nd/dwim-wildcards-as-pathspecs'Junio C Hamano1-1/+2
2016-02-10check_filename: tighten dwim-wildcard ambiguityJeff King1-1/+2
2016-02-10checkout: reorder check_filename conditionalJeff King1-1/+1
2016-01-12checkout,clone: check return value of create_symrefJeff King1-1/+2
2015-11-20Remove get_object_hash.brian m. carlson1-5/+5
2015-11-20Convert struct object to object_idbrian m. carlson1-6/+6
2015-11-20Add several uses of get_object_hash.brian m. carlson1-5/+5
2015-11-01checkout: add --progress optionEdmundo Carmona Antoranz1-2/+12
2015-08-31Merge branch 'hv/submodule-config'Junio C Hamano1-0/+1
2015-08-26Merge branch 'jc/calloc-pathspec'Junio C Hamano1-1/+1
2015-08-20ps_matched: xcalloc() takes nmemb and then element sizeJunio C Hamano1-1/+1
2015-08-19submodule: use new config API for worktree configurationsHeiko Voigt1-0/+1
2015-08-12Merge branch 'es/worktree-add-cleanup'Junio C Hamano1-76/+6
2015-08-03Merge branch 'dt/refs-backend-preamble'Junio C Hamano1-12/+10
2015-07-21refs: new public ref function: safe_create_reflogDavid Turner1-9/+5
2015-07-21refs.c: add err arguments to reflog functionsDavid Turner1-3/+5
2015-07-20checkout: drop intimate knowledge of newly created worktreeEric Sunshine1-7/+2
2015-07-20branch: publish die_if_checked_out()Eric Sunshine1-67/+0
2015-07-20checkout: teach check_linked_checkout() about symbolic link HEADEric Sunshine1-1/+5
2015-07-20checkout: check_linked_checkout: simplify symref parsingEric Sunshine1-9/+6
2015-07-20checkout: check_linked_checkout: improve "already checked out" aestheticEric Sunshine1-0/+1
2015-07-20checkout: generalize die_if_checked_out() branch name argumentEric Sunshine1-7/+8
2015-07-20checkout: die_if_checked_out: simplify strbuf managementEric Sunshine1-4/+3
2015-07-20checkout: improve die_if_checked_out() robustnessEric Sunshine1-7/+7
2015-07-20checkout: name check_linked_checkouts() more meaningfullyEric Sunshine1-2/+2
2015-07-20checkout: avoid resolving HEAD unnecessarilyEric Sunshine1-3/+3
2015-07-13Merge branch 'es/worktree-add'Junio C Hamano1-153/+0
2015-07-13Merge branch 'nd/multiple-work-trees'Junio C Hamano1-12/+11
2015-07-12Revert "checkout: retire --ignore-other-worktrees in favor of --force"Junio C Hamano1-3/+5
2015-07-07checkout: retire --ignore-other-worktrees in favor of --forceEric Sunshine1-5/+3
2015-07-06checkout: require worktree unconditionallyEric Sunshine1-2/+0
2015-07-06checkout: retire --to optionEric Sunshine1-160/+1
2015-07-06checkout: drop 'checkout_opts' dependency from prepare_linked_checkoutEric Sunshine1-4/+5
2015-07-06checkout: make --to unconditionally verboseEric Sunshine1-2/+1
2015-07-06checkout: prepare_linked_checkout: drop now-unused 'new' argumentEric Sunshine1-3/+2
2015-07-06checkout: relocate --to's "no branch specified" checkEric Sunshine1-3/+4
2015-07-06checkout: fix bug with --to and relative HEADEric Sunshine1-4/+12
2015-06-12checkout: don't check worktrees when not necessaryNguyễn Thái Ngọc Duy1-12/+11
2015-05-25add_pending_uninteresting_ref(): rewrite to take an object_id argumentMichael Haggerty1-5/+3
2015-05-25each_ref_fn: change to take an object_id parameterMichael Haggerty1-1/+3
2015-05-11Merge branch 'nd/multiple-work-trees'Junio C Hamano1-12/+257
2015-04-02checkout: call a single commit "it" intead of "them"Thomas Schneider1-2/+9
2015-01-14standardize usage info string formatAlex Henrie1-4/+4
2015-01-07checkout: add --ignore-other-wortreesNguyễn Thái Ngọc Duy1-1/+5
2015-01-07checkout: pass whole struct to parse_branchname_arg instead of individual flagsNguyễn Thái Ngọc Duy1-7/+6
2014-12-22Merge branch 'nd/ls-tree-pathspec'Junio C Hamano1-4/+4
2014-12-05Merge branch 'jk/checkout-from-tree'Junio C Hamano1-0/+18
2014-12-01tree.c: update read_tree_recursive callback to pass strbuf as baseNguyễn Thái Ngọc Duy1-4/+4
2014-12-01checkout: do not fail if target is an empty directoryMax Kirillov1-1/+1
2014-12-01checkout: don't require a work tree when checking out into a new oneDennis Kaarsemaker1-0/+3
2014-12-01checkout: clean up half-prepared directories in --to modeNguyễn Thái Ngọc Duy1-0/+48
2014-12-01checkout: reject if the branch is already checked out elsewhereNguyễn Thái Ngọc Duy1-2/+84
2014-12-01prune: strategies for linked checkoutsNguyễn Thái Ngọc Duy1-2/+17
2014-12-01checkout: support checking out into a new working directoryNguyễn Thái Ngọc Duy1-2/+93
2014-12-01git_snpath(): retire and replace with strbuf_git_path()Nguyễn Thái Ngọc Duy1-5/+8
2014-12-01path.c: make get_pathname() call sites return const char *Nguyễn Thái Ngọc Duy1-1/+1
2014-11-13checkout $tree: do not throw away unchanged index entriesJeff King1-0/+18
2014-10-15refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg1-3/+3
2014-10-14Merge branch 'rs/more-uses-of-skip-prefix'Junio C Hamano1-4/+2
2014-10-07use skip_prefix() to avoid more magic numbersRené Scharfe1-4/+2
2014-10-01lockfile.h: extract new header file for the functions in lockfile.cMichael Haggerty1-1/+1
2014-09-11Merge branch 'dt/cache-tree-repair'Junio C Hamano1-0/+6
2014-07-16Merge branch 'nd/split-index'Junio C Hamano1-7/+5
2014-07-07cache-tree: create/update cache-tree on checkoutDavid Turner1-0/+8
2014-06-20use skip_prefix to avoid repeating stringsJeff King1-2/+2
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-13read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy1-7/+4
2014-06-06Merge branch 'rs/reflog-exists'Junio C Hamano1-6/+2
2014-06-03Merge branch 'mh/ref-transaction'Junio C Hamano1-1/+1