diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-01-18 23:48:46 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-18 23:48:46 (GMT) |
| commit | d899cf559b6a93006993752e7a89d13606380227 (patch) | |
| tree | 267c22ffce9a9d705f48749d650ce2b62b690aa8 /t | |
| parent | ab8a78084b7159d99dae2905e1a3ff04c1500a6d (diff) | |
| parent | 00653435488f5ed86c5d6dc411fa14fa56f5e3bc (diff) | |
| download | git-d899cf559b6a93006993752e7a89d13606380227.zip git-d899cf559b6a93006993752e7a89d13606380227.tar.gz git-d899cf559b6a93006993752e7a89d13606380227.tar.bz2 | |
Merge branch 'maint-1.7.7' into maint
* maint-1.7.7:
Git 1.7.7.6
diff-index: enable recursive pathspec matching in unpack_trees
Conflicts:
GIT-VERSION-GEN
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4010-diff-pathspec.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t4010-diff-pathspec.sh b/t/t4010-diff-pathspec.sh index fbc8cd8..af5134b 100755 --- a/t/t4010-diff-pathspec.sh +++ b/t/t4010-diff-pathspec.sh @@ -48,6 +48,14 @@ test_expect_success \ compare_diff_raw current expected' cat >expected <<\EOF +:100644 100644 766498d93a4b06057a8e49d23f4068f1170ff38f 0a41e115ab61be0328a19b29f18cdcb49338d516 M path1/file1 +EOF +test_expect_success \ + '"*file1" should show path1/file1' \ + 'git diff-index --cached $tree -- "*file1" >current && + compare_diff_raw current expected' + +cat >expected <<\EOF :100644 100644 766498d93a4b06057a8e49d23f4068f1170ff38f 0a41e115ab61be0328a19b29f18cdcb49338d516 M file0 EOF test_expect_success \ |