delta/git.git, branch dt/notes-multiple

notes: handle multiple worktrees

2015-08-11T20:52:27+00:00

Before creating NOTES_MERGE_REF, check NOTES_MERGE_REF using
find_shared_symref and die if we find one.  This prevents simultaneous
merges to the same notes branch from different worktrees.

Signed-off-by: David Turner 
Reviewed-by: Johan Herland 
Signed-off-by: Junio C Hamano

worktrees: add find_shared_symref

2015-08-11T20:48:15+00:00

Add a new function, find_shared_symref, which contains the heart of
die_if_checked_out, but works for any symref, not just HEAD.  Refactor
die_if_checked_out to use the same infrastructure as
find_shared_symref.

Soon, we will use find_shared_symref to protect notes merges in
worktrees.

Signed-off-by: David Turner 
Reviewed-by: Johan Herland 
Signed-off-by: Junio C Hamano

Documentation/git-worktree: fix duplicated 'from'

2015-08-05T19:57:14+00:00

Signed-off-by: Patrick Steinhardt 
Acked-by: Eric Sunshine 
Signed-off-by: Junio C Hamano

Documentation/config: mention "now" and "never" for 'expire' settings

2015-07-28T20:23:03+00:00

In addition to approxidate-style values ("2.months.ago", "yesterday"),
consumers of 'gc.*expire*' configuration variables also accept and
respect 'now' ("do it immediately") and 'never' ("suppress entirely").

Suggested-by: Michael Haggerty 
Signed-off-by: Eric Sunshine 
Signed-off-by: Junio C Hamano

Documentation/git-worktree: fix broken 'linkgit' invocation

2015-07-24T17:11:35+00:00

Signed-off-by: Eric Sunshine 
Signed-off-by: Junio C Hamano

checkout: drop intimate knowledge of newly created worktree

2015-07-20T18:29:52+00:00

Now that git-worktree no longer relies upon git-checkout for new branch
creation, new worktree HEAD set up, or initial worktree population,
git-checkout no longer needs intimate knowledge that it may be operating
in a newly created worktree. Therefore, drop 'new_worktree_mode' and the
private GIT_CHECKOUT_NEW_WORKTREE environment variable by which
git-worktree communicated to git-checkout that it was being invoked to
manipulate a new worktree.

This reverts the remaining changes to checkout.c by 529fef2 (checkout:
support checking out into a new working directory, 2014-11-30).

Signed-off-by: Eric Sunshine 
Signed-off-by: Junio C Hamano

worktree: populate via "git reset --hard" rather than "git checkout"

2015-07-20T18:29:52+00:00

Now that git-worktree handles all functionality (--force, --detach,
-b/-B) previously delegated to git-checkout, actual population of the
new worktree can be accomplished more directly and lightweight with
"git reset --hard" in place of "git checkout".

Signed-off-by: Eric Sunshine 
Signed-off-by: Junio C Hamano

worktree: avoid resolving HEAD unnecessarily

2015-07-20T18:29:52+00:00

Now that git-worktree sets HEAD explicitly to its final value via either
git-symbolic-ref or git-update-ref, rather than relying upon
git-checkout to do so, the "hack" for pacifying is_git_directory() with
a temporary HEAD, though still necessary, can be simplified.

Since the real HEAD is now populated with its proper final value, the
value of the temporary HEAD truly no longer matters, and any value which
looks like an object ID is good enough to satisfy is_git_directory().
Therefore, just set the temporary HEAD to a literal value rather than
going through the effort of resolving the current branch's HEAD.

Signed-off-by: Eric Sunshine 
Signed-off-by: Junio C Hamano

worktree: make setup of new HEAD distinct from worktree population

2015-07-20T18:29:52+00:00

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 
Signed-off-by: Junio C Hamano

worktree: detect branch-name/detached and error conditions locally

2015-07-20T18:29:52+00:00

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 
Signed-off-by: Junio C Hamano