git/git-difftool.perl, branch v2.11.2

Merge branch 'jk/difftool-in-subdir' into maint

2017-01-17T23:14:40Z

Even though an fix was attempted in Git 2.9.3 days, but running "git difftool --dir-diff" from a subdirectory never worked. This has been fixed. * jk/difftool-in-subdir: difftool: rename variables for consistency difftool: chdir as early as possible difftool: sanitize $workdir as early as possible difftool: fix dir-diff index creation when in a subdirectory

difftool: rename variables for consistency

2016-12-12T00:18:59Z

Always call the list of files @files. Always call the worktree $worktree. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

difftool: chdir as early as possible

2016-12-12T00:18:54Z

Make difftool chdir to the top-level of the repository as soon as it can so that we can simplify how paths are handled. Replace construction of absolute paths via string concatenation with relative paths wherever possible. The bulk of the code no longer needs to use absolute paths. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

difftool: sanitize $workdir as early as possible

2016-12-12T00:18:53Z

The double-slash fixup on the $workdir variable was being performed just-in-time to avoid double-slashes in symlink targets, but the rest of the code was silently using paths with embedded "//" in them. A recent user-reported error message contained double-slashes. Eliminate the issue by sanitizing inputs as soon as they arrive. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

difftool: fix dir-diff index creation when in a subdirectory

2016-12-12T00:18:31Z

9ec26e7977 (difftool: fix argument handling in subdirs, 2016-07-18) corrected how path arguments are handled in a subdirectory, but it introduced a regression in how entries outside of the subdirectory are handled by dir-diff. When preparing the right-side of the diff we only include the changed paths in the temporary area. The left side of the diff is constructed from a temporary index that is built from the same set of changed files, but it was being constructed from within the subdirectory. This is a problem because the indexed paths are toplevel-relative, and thus they were not getting added to the index. Teach difftool to chdir to the toplevel of the repository before preparing its temporary indexes. This ensures that all of the toplevel-relative paths are valid. Add test cases to more thoroughly exercise this scenario. Reported-by: Frank Becker Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

difftool: fix dir-diff index creation when in a subdirectory

2016-12-08T18:28:00Z

difftool: use Git::* functions instead of passing around state

2016-07-28T21:01:55Z

Call Git::command() and friends directly wherever possible. This makes it clear that these operations can be invoked directly without needing to manage the current directory and related GIT_* environment variables. Eliminate find_repository() since we can now use wc_path() and not worry about side-effects involving environment variables. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

difftool: avoid $GIT_DIR and $GIT_WORK_TREE

2016-07-28T21:01:55Z

Environment variables are global and hard to reason about. Use the `--git-dir` and `--work-tree` arguments when invoking `git` instead of relying on the environment. Add a test to ensure that difftool's dir-diff feature works when these variables are present in the environment. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

difftool: fix argument handling in subdirs

2016-07-19T18:12:27Z

When in a subdirectory of a repository, path arguments should be interpreted relative to the current directory not the root of the working tree. The Git::repository object passed into setup_dir_diff() is configured to handle this correctly but we create a new Git::repository here without setting the WorkingSubdir argument. By simply using the existing repository, path arguments are handled relative to the current directory. Reported-by: Bernhard Kirchen Signed-off-by: John Keeping Acked-by: David Aguilar Signed-off-by: Junio C Hamano

difftool: handle unmerged files in dir-diff mode

2016-05-16T21:53:05Z

When files are unmerged they can show up as both unmerged and modified in the output of `git diff --raw`. This causes difftool's dir-diff to create filesystem entries for the same path twice, which fails when it encounters a duplicate path. Ensure that each worktree path is only processed once. Add a test to demonstrate the breakage. Reported-by: Jan Smets Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano