Skip to content
  • Junio C Hamano's avatar
    Merge branch 'nd/worktree-various-heads' · 352d72a3
    Junio C Hamano authored
    The experimental "multiple worktree" feature gains more safety to
    forbid operations on a branch that is checked out or being actively
    worked on elsewhere, by noticing that e.g. it is being rebased.
    
    * nd/worktree-various-heads:
      branch: do not rename a branch under bisect or rebase
      worktree.c: check whether branch is bisected in another worktree
      wt-status.c: split bisect detection out of wt_status_get_state()
      worktree.c: check whether branch is rebased in another worktree
      worktree.c: avoid referencing to worktrees[i] multiple times
      wt-status.c: make wt_status_check_rebase() work on any worktree
      wt-status.c: split rebase detection out of wt_status_get_state()
      path.c: refactor and add worktree_git_path()
      worktree.c: mark current worktree
      worktree.c: make find_shared_symref() return struct worktree *
      worktree.c: store "id" instead of "git_dir"
      path.c: add git_common_path() and strbuf_git_common_path()
      dir.c: rename str(n)cmp_icase to fspath(n)cmp
    352d72a3