git/builtin/worktree.c, branch v2.10.2

worktree: honor configuration variables

2016-09-27T17:51:33Z

The command accesses default_abbrev (defined in environment.c and is updated via core.abbrev configuration), but never makes any call to git_config(). The output from "worktree list" ignores the abbrev setting for this reason. Make a call to git_config() to read the default set of configuration variables at the beginning of the command. Signed-off-by: Junio C Hamano

use CHILD_PROCESS_INIT to initialize automatic variables

2016-08-05T22:10:05Z

Initialize struct child_process variables already when they're defined. That's shorter and saves a function call. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

Merge branch 'nd/worktree-lock'

2016-07-28T17:34:42Z

"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()

worktree: add "unlock" command

2016-07-08T22:31:04Z

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

worktree: add "lock" command

2016-07-08T22:31:04Z

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

avoid using sha1_to_hex output as printf format

2016-07-08T17:11:27Z

We know that it should not contain any percent-signs, but it's a good habit not to feed non-literals to printf formatters. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

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

2016-07-06T20:38:11Z

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: allow "-" short-hand for @{-1} in add command

2016-05-31T19:28:25Z

Since `git worktree add` uses `git checkout` when `[]` is used, and `git checkout -` is already supported, it makes sense to allow the same shortcut in `git worktree add`. Signed-off-by: Jordan DE GEA Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano

worktree: simplify prefixing paths

2016-05-24T20:19:23Z

This also makes slash conversion always happen on Windows (a side effect of prefix_filename). Which is a good thing. Signed-off-by: Nguyễn Thái Ngọc Duy Reviewed-by: Eric Sunshine Signed-off-by: Junio C Hamano

worktree: avoid 0{40}, too many zeroes, hard to read

2016-05-24T20:19:22Z

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