delta/git.git/worktree.c, branch jk/diff-submodule-diff-inline

Merge branch 'nd/worktree-lock'

2016-07-28T17:34:42+00:00

"git worktree prune" protected worktrees that are marked as
"locked" by creating a file in a known location.  "git worktree"
command learned a dedicated command pair to create and remove such
a file, so that the users do not have to do this with editor.

* nd/worktree-lock:
  worktree.c: find_worktree() search by path suffix
  worktree: add "unlock" command
  worktree: add "lock" command
  worktree.c: add is_worktree_locked()
  worktree.c: add is_main_worktree()
  worktree.c: add find_worktree()

Merge branch 'rs/worktree-use-strbuf-absolute-path'

2016-07-25T21:13:37+00:00

Code simplification.

* rs/worktree-use-strbuf-absolute-path:
  worktree: use strbuf_add_absolute_path() directly

worktree: use strbuf_add_absolute_path() directly

2016-07-12T22:11:01+00:00

absolute_path() is a wrapper for strbuf_add_absolute_path().  Call the
latter directly for adding absolute paths to a strbuf.  That's shorter
and avoids an extra string copy.

Signed-off-by: Rene Scharfe 
Signed-off-by: Junio C Hamano

worktree.c: find_worktree() search by path suffix

2016-07-08T22:31:04+00:00

This allows the user to do something like "worktree lock foo" or
"worktree lock to/foo" instead of "worktree lock /long/path/to/foo" if
it's unambiguous.

With completion support it could be quite convenient. While this base
name search can be done in the same worktree iteration loop, the code is
split into a separate function for clarity.

Suggested-by: Eric Sunshine 
Signed-off-by: Nguyễn Thái Ngọc Duy 
Signed-off-by: Junio C Hamano

Merge branch 'nd/worktree-cleanup-post-head-protection'

2016-07-06T20:38:11+00:00

Further preparatory clean-up for "worktree" feature continues.

* nd/worktree-cleanup-post-head-protection:
  worktree: simplify prefixing paths
  worktree: avoid 0{40}, too many zeroes, hard to read
  worktree.c: use is_dot_or_dotdot()
  git-worktree.txt: keep subcommand listing in alphabetical order
  worktree.c: rewrite mark_current_worktree() to avoid strbuf
  completion: support git-worktree

worktree.c: add is_worktree_locked()

2016-06-13T18:53:14+00:00

We need this later to avoid double locking a worktree, or unlocking one
when it's not even locked.

Signed-off-by: Nguyễn Thái Ngọc Duy 
Signed-off-by: Junio C Hamano

worktree.c: add is_main_worktree()

2016-06-04T04:58:35+00:00

Main worktree _is_ different. You can lock (*) a linked worktree but not
the main one, for example. Provide an API for checking that.

(*) Add the file $GIT_DIR/worktrees/xxx/locked to avoid worktree xxx
from being removed or moved.

Signed-off-by: Nguyễn Thái Ngọc Duy 
Signed-off-by: Junio C Hamano

worktree.c: add find_worktree()

2016-06-04T04:58:18+00:00

So far we haven't needed to identify an existing worktree from command
line. Future commands such as lock or move will need it. The current
implementation identifies worktrees by path (*). In future, the function
could learn to identify by $(basename $path) or tags...

(*) We could probably go cheaper with comparing inode number (and
probably more reliable than paths when unicode enters the game). But not
all systems have good inode that so let's stick to something simple for
now.

Helped-by: Eric Sunshine 
Signed-off-by: Nguyễn Thái Ngọc Duy 
Signed-off-by: Junio C Hamano

worktree.c: use is_dot_or_dotdot()

2016-05-24T20:19:22+00:00

Signed-off-by: Nguyễn Thái Ngọc Duy 
Reviewed-by: Eric Sunshine 
Signed-off-by: Junio C Hamano

worktree.c: rewrite mark_current_worktree() to avoid strbuf

2016-05-24T20:19:22+00:00

strbuf is a bit overkill for this function. What we need is to call
absolute_path() twice and make sure the second call does not destroy the
result of the first. One buffer allocation is enough.

Signed-off-by: Nguyễn Thái Ngọc Duy 
Reviewed-by: Eric Sunshine 
Signed-off-by: Junio C Hamano