development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-12 21:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'da/difftool-dir-diff-fix' into da/t7800-cleanup

Browse source 
* da/difftool-dir-diff-fix:
  difftool: fix dir-diff index creation when in a subdirectory
This commit is contained in:
Junio C Hamano 2017-02-08 13:36:03 -08:00
parent e66adcadfe 853e10c197
commit a83c2d2972
2 changed files with 45 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/examples/git-difftool.perl
View file

@ -182,6 +182,10 @@ sub setup_dir_diff
}
}
# Go to the root of the worktree so that the left index files
# are properly setup -- the index is toplevel-relative.
chdir($workdir);
# Setup temp directories
my $tmpdir = tempdir('git-difftool.XXXXX', CLEANUP => 0, TMPDIR => 1);
my $ldir = "$tmpdir/left";

44
t/t7800-difftool.sh
View file

@ -386,6 +386,7 @@ test_expect_success 'setup change in subdirectory' '
echo master >sub/sub &&
git add sub/sub &&
git commit -m "added sub/sub" &&
git tag v1 &&
echo test >>file &&
echo test >>sub/sub &&
git add file sub/sub &&
@ -421,12 +422,49 @@ run_dir_diff_test 'difftool --dir-diff ignores --prompt' '
grep file output
'
run_dir_diff_test 'difftool --dir-diff from subdirectory' '
run_dir_diff_test 'difftool --dir-diff branch from subdirectory' '
(
cd sub &&
git difftool --dir-diff $symlinks --extcmd ls branch >output &&
grep sub output &&
grep file output
# "sub" must only exist in "right"
# "file" and "file2" must be listed in both "left" and "right"
test "1" = $(grep sub output | wc -l) &&
test "2" = $(grep file"$" output | wc -l) &&
test "2" = $(grep file2 output | wc -l)
)
'
run_dir_diff_test 'difftool --dir-diff v1 from subdirectory' '
(
cd sub &&
git difftool --dir-diff $symlinks --extcmd ls v1 >output &&
# "sub" and "file" exist in both v1 and HEAD.
# "file2" is unchanged.
test "2" = $(grep sub output | wc -l) &&
test "2" = $(grep file output | wc -l) &&
test "0" = $(grep file2 output | wc -l)
)
'
run_dir_diff_test 'difftool --dir-diff branch from subdirectory w/ pathspec' '
(
cd sub &&
git difftool --dir-diff $symlinks --extcmd ls branch -- .>output &&
# "sub" only exists in "right"
# "file" and "file2" must not be listed
test "1" = $(grep sub output | wc -l) &&
test "0" = $(grep file output | wc -l)
)
'
run_dir_diff_test 'difftool --dir-diff v1 from subdirectory w/ pathspec' '
(
cd sub &&
git difftool --dir-diff $symlinks --extcmd ls v1 -- .>output &&
# "sub" exists in v1 and HEAD
# "file" is filtered out by the pathspec
test "2" = $(grep sub output | wc -l) &&
test "0" = $(grep file output | wc -l)
)
'