diff options
author | Eric Sunshine <sunshine@sunshineco.com> | 2015-07-17 19:00:13 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-07-20 11:29:52 -0700 |
commit | f7c9dac1b037e453e934c272d77cc648d56d5477 (patch) | |
tree | 9eb5bec4ee344a68f62d19039879486f8f2d01d6 /git-mergetool--lib.sh | |
parent | worktree: add_worktree: construct worktree-population command locally (diff) | |
download | tgif-f7c9dac1b037e453e934c272d77cc648d56d5477.tar.xz |
worktree: detect branch-name/detached and error conditions locally
git-worktree currently conflates setting of HEAD in the new worktree
with initial worktree population via a single git-checkout invocation,
which requires git-checkout to have special knowledge that it is
operating in a newly created worktree. The eventual goal is to separate
these operations and rid git-checkout of that overly-intimate knowledge.
Once these operations are separate, git-worktree will no longer be able
to rely upon git-branch to determine the state of the worktree (branch
name or detached), or to check for error conditions, such as the
requested branch already checked out elsewhere, or an invalid reference.
Therefore, imbue git-worktree with the intelligence to determine a
branch name or detached state locally, and to perform error checking on
its own.
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