diff options
author | Eric Sunshine <sunshine@sunshineco.com> | 2015-07-17 19:00:14 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-07-20 11:29:52 -0700 |
commit | 7f44e3d1de08bf99c8dbd69d6437b712df369692 (patch) | |
tree | bdb0dc1f562e250d036d72073ceefad36041eeab /git-mergetool--lib.sh | |
parent | worktree: detect branch-name/detached and error conditions locally (diff) | |
download | tgif-7f44e3d1de08bf99c8dbd69d6437b712df369692.tar.xz |
worktree: make setup of new HEAD distinct from worktree population
git-worktree currently conflates setting of HEAD in the new worktree and
initial worktree population into a single git-checkout invocation which
requires git-checkout to have special knowledge that it is operating on
a newly created worktree. The eventual goal is to rid git-checkout of
that overly-intimate knowledge.
Once these operations are separate, git-worktree will no longer be able
to delegate to git-branch the setting of the new worktree's HEAD to the
desired branch (or commit, if detached). Therefore, make git-worktree
itself responsible for setting up HEAD as either a symbolic reference,
if associated with a branch, or detached, if not.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions