aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/worktree.c
AgeCommit message (Expand)AuthorFilesLines
2021-07-15worktree: teach `add` to accept --reason <string> with --lockStephen Manz1-5/+16
2021-07-14worktree: mark lock strings with `_()` for translationStephen Manz1-2/+2
2021-05-20Merge branch 'en/dir-traversal'Junio C Hamano1-3/+1
2021-05-13dir: introduce readdir_skip_dot_and_dotdot() helperElijah Newren1-3/+1
2021-04-27hash: provide per-algorithm null OIDsbrian m. carlson1-2/+2
2021-03-14worktree: fix leak in dwim_branch()Andrzej Hunt1-4/+6
2021-01-30worktree: teach `list` verbose modeRafael Silva1-2/+12
2021-01-30worktree: teach `list` to annotate prunable worktreeRafael Silva1-0/+10
2021-01-30worktree: teach `list --porcelain` to annotate locked worktreeRafael Silva1-0/+13
2021-01-30worktree: teach worktree_lock_reason() to gently handle main worktreeRafael Silva1-1/+1
2021-01-30worktree: libify should_prune_worktree()Rafael Silva1-74/+1
2020-12-21worktree: teach `repair` to fix multi-directional breakageEric Sunshine1-1/+1
2020-11-30Merge branch 'mt/worktree-error-message-fix'Junio C Hamano1-2/+2
2020-11-21worktree: fix order of arguments in error messageMatheus Tavares1-2/+2
2020-10-12worktree: teach `list` to annotate locked worktreeRafael Silva1-1/+4
2020-09-18Merge branch 'es/wt-add-detach'Junio C Hamano1-1/+1
2020-09-09Merge branch 'es/worktree-repair'Junio C Hamano1-0/+30
2020-09-09Merge branch 'jk/worktree-check-clean-leakfix'Junio C Hamano1-5/+3
2020-09-06worktree: teach `add` to recognize -d as shorthand for --detachEric Sunshine1-1/+1
2020-08-31worktree: teach "repair" to fix outgoing links to worktreesEric Sunshine1-2/+5
2020-08-31worktree: teach "repair" to fix worktree back-links to main worktreeEric Sunshine1-0/+12
2020-08-27worktree: add skeleton "repair" commandEric Sunshine1-0/+15
2020-08-27worktree: fix leak in check_clean_worktree()Jeff King1-5/+3
2020-07-30strvec: rename struct fieldsJeff King1-3/+3
2020-07-28strvec: fix indentation in renamed callsJeff King1-9/+9
2020-07-28strvec: convert builtin/ callers away from argv_array nameJeff King1-21/+21
2020-07-28strvec: rename files from argv-array to strvecJeff King1-1/+1
2020-07-06Merge branch 'es/get-worktrees-unsort'Junio C Hamano1-6/+26
2020-06-22Merge branch 'es/worktree-duplicate-paths'Junio C Hamano1-35/+93
2020-06-22worktree: drop get_worktrees() unused 'flags' argumentEric Sunshine1-6/+6
2020-06-22worktree: drop get_worktrees() special-purpose sorting optionEric Sunshine1-1/+21
2020-06-10worktree: make "move" refuse to move atop missing registered worktreeEric Sunshine1-2/+1
2020-06-10worktree: generalize candidate worktree path validationEric Sunshine1-13/+16
2020-06-10worktree: prune linked worktree referencing main worktree pathEric Sunshine1-0/+15
2020-06-10worktree: prune duplicate entries referencing same worktree pathEric Sunshine1-6/+43
2020-06-10worktree: make high-level pruning re-usableEric Sunshine1-6/+9
2020-06-10worktree: give "should be pruned?" function more meaningful nameEric Sunshine1-2/+2
2020-06-08worktree: factor out repeated string literalEric Sunshine1-11/+12
2020-03-10real_path: remove unsafe APIAlexandr Miloslavskiy1-3/+6
2020-02-24worktree: don't allow "add" validation to be fooled by suffix matchingEric Sunshine1-8/+1
2019-12-01Merge branch 'pb/no-recursive-reset-hard-in-worktree-add'Junio C Hamano1-1/+1
2019-10-30worktree: teach "add" to ignore submodule.recurse configPhilippe Blain1-1/+1
2019-10-11Merge branch 'rs/dedup-includes'Junio C Hamano1-1/+0
2019-10-11Merge branch 'bc/object-id-part17'Junio C Hamano1-1/+1
2019-10-04treewide: remove duplicate #include directivesRené Scharfe1-1/+0
2019-08-19builtin/worktree: switch null_sha1 to null_oidbrian m. carlson1-1/+1
2019-08-13worktree remove: clarify error message on dirty worktreeSZEDER Gábor1-1/+1
2019-06-13Merge branch 'nd/worktree-name-sanitization'Junio C Hamano1-1/+9
2019-05-15worktree add: sanitize worktree namesNguyễn Thái Ngọc Duy1-1/+9
2019-04-10Merge branch 'ms/worktree-add-atomic-mkdir'Junio C Hamano1-5/+7
2019-03-12worktree: fix worktree add raceMichal Suchanek1-5/+7
2019-02-22trace2:data: add trace2 hook classificationJeff Hostetler1-0/+1
2019-01-07worktree: allow to (re)move worktrees with uninitialized submodulesNguyễn Thái Ngọc Duy1-6/+23
2018-10-31worktree: rename is_worktree_locked to worktree_lock_reasonNickolai Belakovski1-5/+5
2018-08-30worktree: delete .git/worktrees if empty after 'remove'Eric Sunshine1-1/+7
2018-08-30worktree: teach 'remove' to override lock when --force given twiceEric Sunshine1-5/+6
2018-08-30worktree: teach 'move' to override lock when --force given twiceEric Sunshine1-4/+9
2018-08-30worktree: teach 'add' to respect --force for registered but missing pathEric Sunshine1-2/+8
2018-08-30worktree: disallow adding same path multiple timesEric Sunshine1-0/+25
2018-08-30worktree: prepare for more checks of whether path can become worktreeEric Sunshine1-2/+7
2018-08-30worktree: generalize delete_git_dir() to reduce code duplicationEric Sunshine1-16/+9
2018-08-30worktree: move delete_git_dir() earlier in file for upcoming new callersEric Sunshine1-14/+14
2018-08-17worktree: add --quiet optionElia Pinto1-3/+13
2018-06-11checkout: pass the "num_matches" up to callersÆvar Arnfjörð Bjarmason1-2/+2
2018-05-23Merge branch 'tg/worktree-add-existing-branch'Junio C Hamano1-27/+74
2018-05-08Merge branch 'sb/worktree-remove-opt-force'Junio C Hamano1-2/+3
2018-04-30worktree: teach "add" to check out existing branchesThomas Gummerer1-2/+11
2018-04-30worktree: factor out dwim_branch functionThomas Gummerer1-11/+18
2018-04-30worktree: improve message when creating a new worktreeThomas Gummerer1-2/+36
2018-04-30worktree: remove extra members from struct add_optsThomas Gummerer1-17/+16
2018-04-18worktree: accept -f as short for --force for removalStefan Beller1-2/+3
2018-04-10Merge branch 'nd/worktree-prune'Junio C Hamano1-9/+2
2018-04-10Merge branch 'bc/object-id'Junio C Hamano1-2/+2
2018-03-15worktree prune: improve prune logic when worktree is movedNguyễn Thái Ngọc Duy1-1/+2
2018-03-15worktree: delete dead codeNguyễn Thái Ngọc Duy1-8/+0
2018-03-14Merge branch 'nd/parseopt-completion'Junio C Hamano1-1/+3
2018-03-14Merge branch 'nd/worktree-move'Junio C Hamano1-0/+220
2018-03-14Convert find_unique_abbrev* to struct object_idbrian m. carlson1-2/+2
2018-02-28Merge branch 'es/worktree-add-post-checkout-hook'Junio C Hamano1-3/+17
2018-02-15Merge branch 'jc/worktree-add-short-help'Junio C Hamano1-1/+1
2018-02-15worktree: add: fix 'post-checkout' not knowing new worktree locationEric Sunshine1-3/+17
2018-02-12worktree remove: allow it when $GIT_WORK_TREE is already goneNguyễn Thái Ngọc Duy1-5/+7
2018-02-12worktree remove: new commandNguyễn Thái Ngọc Duy1-1/+133
2018-02-12worktree move: refuse to move worktrees with submodulesNguyễn Thái Ngọc Duy1-0/+23
2018-02-12worktree move: accept destination as directoryNguyễn Thái Ngọc Duy1-1/+10
2018-02-12worktree move: new commandNguyễn Thái Ngọc Duy1-0/+53
2018-02-09completion: use __gitcomp_builtin in _git_worktreeNguyễn Thái Ngọc Duy1-1/+1
2018-02-09parse-options: let OPT__FORCE take optional flags argumentNguyễn Thái Ngọc Duy1-1/+3
2018-01-17worktree: say that "add" takes an arbitrary commit in short-helpJunio C Hamano1-1/+1
2017-12-27Merge branch 'es/worktree-checkout-hook'Junio C Hamano1-6/+16
2017-12-07worktree: invoke post-checkout hook (unless --no-checkout)Eric Sunshine1-6/+16
2017-12-06add worktree.guessRemote config optionThomas Gummerer1-2/+12
2017-12-06worktree: add --guess-remote flag to add subcommandThomas Gummerer1-0/+10
2017-11-27worktree: make add <path> <branch> dwimThomas Gummerer1-0/+16
2017-11-27worktree: add --[no-]track option to the add subcommandThomas Gummerer1-0/+8
2017-10-16worktree: convert struct worktree to object_idbrian m. carlson1-3/+3
2017-09-27worktree: check the result of read_in_full()Jeff King1-1/+18
2017-09-27worktree: use xsize_t to access file sizeJeff King1-2/+3
2017-09-08add UNLEAK annotation for reducing leak false positivesJeff King1-0/+2
2017-06-24Merge branch 'ab/free-and-null'Junio C Hamano1-4/+2
2017-06-24Merge branch 'bw/config-h'Junio C Hamano1-0/+1
2017-06-16*.[ch] refactoring: make use of the FREE_AND_NULL() macroÆvar Arnfjörð Bjarmason1-4/+2
2017-06-15config: don't include config.h by defaultBrandon Williams1-0/+1
2017-05-29Merge branch 'js/plug-leaks'Junio C Hamano1-3/+5
2017-05-16Merge branch 'js/larger-timestamps'Junio C Hamano1-2/+2
2017-05-08show_worktree(): plug memory leakJohannes Schindelin1-3/+5
2017-04-27timestamp_t: a new data type for timestampsJohannes Schindelin1-2/+2
2017-04-26Merge branch 'nd/worktree-add-lock'Junio C Hamano1-4/+11
2017-04-26Merge branch 'jk/war-on-git-path'Junio C Hamano1-4/+2
2017-04-20replace strbuf_addstr(git_path()) with git_path_buf()Jeff King1-4/+2
2017-04-20worktree add: add --lock optionNguyễn Thái Ngọc Duy1-4/+11
2017-03-21prefix_filename: return newly allocated stringJeff King1-1/+2
2017-03-21prefix_filename: drop length parameterJeff King1-1/+1
2017-02-10Merge branch 'ps/worktree-prune-help-fix'Junio C Hamano1-2/+2
2017-02-06worktree: fix option descriptions for `prune`Patrick Steinhardt1-2/+2
2016-11-28worktree list: keep the list sortedNguyễn Thái Ngọc Duy1-1/+1
2016-11-28worktree.c: get_worktrees() takes a new flag argumentNguyễn Thái Ngọc Duy1-3/+3
2016-11-28get_worktrees() must return main worktree as first item even on errorNguyễn Thái Ngọc Duy1-2/+4
2016-11-28worktree: reorder an if statementNguyễn Thái Ngọc Duy1-3/+3
2016-09-27worktree: honor configuration variablesJunio C Hamano1-0/+2
2016-08-05use CHILD_PROCESS_INIT to initialize automatic variablesRené Scharfe1-4/+2
2016-07-28Merge branch 'nd/worktree-lock'Junio C Hamano1-0/+66
2016-07-08worktree: add "unlock" commandNguyễn Thái Ngọc Duy1-0/+28
2016-07-08worktree: add "lock" commandNguyễn Thái Ngọc Duy1-0/+38
2016-07-08avoid using sha1_to_hex output as printf formatJeff King1-1/+1
2016-07-06Merge branch 'nd/worktree-cleanup-post-head-protection'Junio C Hamano1-4/+6
2016-05-31worktree: allow "-" short-hand for @{-1} in add commandJordan DE GEA1-0/+3
2016-05-24worktree: simplify prefixing pathsNguyễn Thái Ngọc Duy1-1/+3
2016-05-24worktree: avoid 0{40}, too many zeroes, hard to readNguyễn Thái Ngọc Duy1-1/+1
2016-05-24worktree.c: use is_dot_or_dotdot()Nguyễn Thái Ngọc Duy1-1/+1
2016-05-24git-worktree.txt: keep subcommand listing in alphabetical orderNguyễn Thái Ngọc Duy1-1/+1
2016-05-23Merge branch 'nd/worktree-various-heads'Junio C Hamano1-2/+2
2016-05-17Merge branch 'nd/error-errno'Junio C Hamano1-1/+1
2016-05-09builtin/worktree.c: use error_errno()Nguyễn Thái Ngọc Duy1-1/+1
2016-04-22worktree.c: check whether branch is rebased in another worktreeNguyễn Thái Ngọc Duy1-2/+2
2016-03-29worktree: add: introduce --checkout optionRay Zhang1-11/+18
2016-02-26Merge branch 'jk/tighten-alloc'Junio C Hamano1-1/+1
2016-02-22use xmallocz to avoid size arithmeticJeff King1-1/+1
2016-02-15worktree add -B: do the checkout test before update branchNguyễn Thái Ngọc Duy1-1/+10
2016-02-15worktree: fix "add -B"Nguyễn Thái Ngọc Duy1-3/+1
2015-11-20Convert struct object to object_idbrian m. carlson1-1/+1
2015-10-26Merge branch 'es/worktree-add'Junio C Hamano1-1/+1
2015-10-18worktree: usage: denote <branch> as optional with 'add'Sidhant Sharma1-1/+1
2015-10-08worktree: add 'list' commandMichael Rappazzo1-0/+88
2015-08-31Merge branch 'jc/am-state-fix'Junio C Hamano1-5/+5
2015-08-25write_file(): drop caller-supplied LF from calls to create a one-liner fileJunio C Hamano1-5/+5
2015-08-24write_file(): drop "fatal" parameterJunio C Hamano1-5/+5
2015-08-12Merge branch 'es/worktree-add-cleanup'Junio C Hamano1-40/+83
2015-07-20worktree: populate via "git reset --hard" rather than "git checkout"Eric Sunshine1-2/+1
2015-07-20worktree: avoid resolving HEAD unnecessarilyEric Sunshine1-12/+5
2015-07-20worktree: make setup of new HEAD distinct from worktree populationEric Sunshine1-5/+15
2015-07-20worktree: detect branch-name/detached and error conditions locallyEric Sunshine1-0/+18
2015-07-20worktree: add_worktree: construct worktree-population command locallyEric Sunshine1-11/+8
2015-07-20worktree: elucidate environment variables intended for child processesEric Sunshine1-2/+5
2015-07-20worktree: make branch creation distinct from worktree populationEric Sunshine1-3/+14
2015-07-20worktree: add: suppress auto-vivication with --detach and no <branch>Eric Sunshine1-1/+1
2015-07-20worktree: make --detach mutually exclusive with -b/-BEric Sunshine1-2/+2
2015-07-20worktree: introduce options containerEric Sunshine1-18/+27
2015-07-20worktree: simplify new branch (-b/-B) option checkingEric Sunshine1-5/+8
2015-07-20worktree: improve worktree setup messageEric Sunshine1-1/+1
2015-07-13Merge branch 'es/worktree-add'Junio C Hamano1-0/+199
2015-07-12Revert "checkout: retire --ignore-other-worktrees in favor of --force"Junio C Hamano1-1/+1
2015-07-07checkout: retire --ignore-other-worktrees in favor of --forceEric Sunshine1-1/+1
2015-07-07worktree: add: auto-vivify new branch when <branch> is omittedEric Sunshine1-2/+6
2015-07-06worktree: add: make -b/-B default to HEAD when <branch> is omittedEric Sunshine1-2/+4
2015-07-06worktree: extract basename computation to new functionEric Sunshine1-9/+20
2015-07-06checkout: retire --to optionEric Sunshine1-6/+138
2015-07-06worktree: add -b/-B optionsEric Sunshine1-0/+11
2015-07-06worktree: add --detach optionEric Sunshine1-1/+4
2015-07-06worktree: add --force optionEric Sunshine1-1/+5
2015-07-06worktree: introduce "add" commandEric Sunshine1-0/+31
2015-06-29worktree: new place for "git prune --worktrees"Nguyễn Thái Ngọc Duy1-0/+133