Move worktree setup out of setup_git_directory*
PATCH 1/1 Move worktree setup out of setup_git_directory*
setup_git_directory* now work as if there is no worktree. It may set some worktree-related variables but its prefix (and current directory) should not be affected by worktree settings.
While at it, put set_work_tree() code intosetup_git_directory_gently() for cleaner code.
Previously only setup_git_directory() takes worktree into account when calculating prefix (with an exception). This behaviour possibly gives commands that do only call setup_git_directory_gently() wrong prefix. The behavior does not expose often as setup_git_directory_gently() tries to make correct prefix if both GIT_DIR and GIT_WORK_TREE are set (the mentioned exception). Only if core.worktree is used, the defect is summoned. Additional test is added to catch this.
setup_work_tree() will now take the role of recalculating prefix when worktree is required.
This also effectively reverts dd5c8af176bb935a0b01a7dc2d5e022565c3aac3. The problem is IMHO that git-diff does not setup worktree when it needs it, so setting up worktree from setup_git_directory_gently() is a fix in a wrong place.
---
Now I'm pretty sure I made it wrong in builtin-diff.c. But I found no better solution as diff territory is too far from my home.
One more thing, with this change, "git ls-files -c" would show full path as it does not require a worktree, hence no worktree setup, NULL prefix or so. Is it bad?
builtin-blame.c | 4 +- builtin-diff.c | 7 ++++- builtin-ls-files.c | 10 +++--- builtin-rev-parse.c | 2 + builtin-rm.c | 2 +- cache.h | 2 +- git.c | 2 +- setup.c | 80 ++++++++++++++++---------------------------------- t/t1501-worktree.sh | 8 ++++- 9 files changed, 51 insertions(+), 66 deletions(-)
builtin-blame.c +2 -2
@@ -2280,6 +2280,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)/* (3) */ if (argc <= i)usage (blame_usage); + prefix =setup_work_tree (prefix); path =add_prefix (prefix, argv[i]);if (i +1 == argc -1 ) { final_commit_name = argv[i +1 ];
@@ -2295,7 +2296,6 @@ int cmd_blame(int argc, const char **argv, const char *prefix)else if (i != argc -1 )usage (blame_usage);/* garbage at end */ -setup_work_tree ();if (!has_path_in_work_tree (path))die ("cannot stat path %s: %s" , path,strerror (errno));
@@ -2343,7 +2343,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)* do not default to HEAD, but use the working tree * or "--contents". */ -setup_work_tree (); + prefix =setup_work_tree (prefix); sb.final =fake_working_tree_commit (path, contents_from);add_pending_object (&revs, &(sb.final->object),":" ); }
builtin-diff.c +6 -1
@@ -246,8 +246,13 @@ int cmd_diff(int argc, const char **argv, const char *prefix)if (!setup_diff_no_index (&rev, argc, argv, nongit, prefix)) argc =0 ; -else +else { + prefix =setup_work_tree (prefix); +/* reinitialize rev as prefix can change */ +init_revisions (&rev, prefix); + rev.diffopt.skip_stat_unmatch = !!diff_auto_refresh_index; argc =setup_revisions (argc, argv, &rev,NULL ); + }if (!rev.diffopt.output_format) { rev.diffopt.output_format =DIFF_FORMAT_PATCH ;if (diff_setup_done (&rev.diffopt) <0 )
builtin-ls-files.c +5 -5
@@ -23,7 +23,7 @@ static int show_valid_bit;static int line_terminator ='\n' ;static int prefix_len; -static int prefix_offset; +static int prefix_offset =-1 ;static const char **pathspec;static int error_unmatch;static char *ps_matched;
@@ -433,8 +433,6 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix)struct dir_struct dir;memset (&dir,0 ,sizeof (dir)); -if (prefix) - prefix_offset =strlen (prefix);git_config (git_default_config);for (i =1 ; i < argc; i++) {
@@ -566,8 +564,10 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix)break ; } -if (require_work_tree && !is_inside_work_tree ()) -setup_work_tree (); +if (require_work_tree) + prefix =setup_work_tree (prefix); +if (prefix_offset ==-1 ) + prefix_offset = prefix ?strlen (prefix) :0 ; pathspec =get_pathspec (prefix, argv + i);
builtin-rev-parse.c +2 -0
@@ -441,6 +441,8 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)continue ; }if (!strcmp (arg,"--show-prefix" )) { +if (is_inside_work_tree ()) + prefix =setup_work_tree (prefix);if (prefix)puts (prefix);continue ;
builtin-rm.c +1 -1
@@ -156,7 +156,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)usage_with_options (builtin_rm_usage, builtin_rm_options);if (!index_only) -setup_work_tree (); + prefix =setup_work_tree (prefix); pathspec =get_pathspec (prefix, argv); seen =NULL ;
cache.h +1 -1
@@ -229,7 +229,7 @@ extern const char *get_git_work_tree(void);#define ALTERNATE_DB_ENVIRONMENT "GIT_ALTERNATE_OBJECT_DIRECTORIES"extern const char **get_pathspec (const char *prefix,const char **pathspec); -extern void setup_work_tree (void ); +extern const char *setup_work_tree (const char *prefix);extern const char *setup_git_directory_gently (int *);extern const char *setup_git_directory (void );extern const char *prefix_path (const char *prefix,int len,const char *path);
git.c +1 -1
@@ -259,7 +259,7 @@ static int run_command(struct cmd_struct *p, int argc, const char **argv)if (p->option &USE_PAGER )setup_pager ();if (p->option &NEED_WORK_TREE ) -setup_work_tree (); + prefix =setup_work_tree (prefix);trace_argv_printf (argv,"trace: built-in: git" );
setup.c +26 -54
105 lines not on this page · raw message
t/t1501-worktree.sh +7 -1
@@ -58,6 +58,12 @@ cd sub/dir || exit 1 test_rev_parse 'subdirectory' false false true sub/dir/ cd ../../.. || exit 1 +test_expect_success 'setup_work_tree() gives correct prefix' ' + (cd work/sub && touch untracked && + test "$(git ls-files -o)" = untracked)' + +rm work/sub/untracked || exit 1 + say "GIT_WORK_TREE=relative path (override core.worktree)" export GIT_DIR=$(pwd)/repo.git export GIT_CONFIG=$GIT_DIR/config
@@ -103,7 +109,7 @@ test_expect_success 'repo finds its work tree from work tree, too' ' test sub/dir/tracked = "$(git ls-files)") ' -test_expect_success '_gently() groks relative GIT_DIR & GIT_WORK_TREE' ' +test_expect_success '"git diff" setup worktree properly' ' cd repo.git/work/sub/dir && GIT_DIR=../../.. GIT_WORK_TREE=../.. GIT_PAGER= \ git diff --exit-code tracked &&
Signature · 1 line
1.5.3.7.2155.g4c25