diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-25 23:12:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-25 23:12:21 -0700 |
| commit | e9b5b75ca87f45292de8ecde5d4d0512ac9542cd (patch) | |
| tree | be4cc0707c97c8bbd2dc4699f646f886fe2739a9 /t | |
| parent | 71459c193d04870076efa0a387c317390b53e3e2 (diff) | |
| parent | 5c21ac0e7c475c82039ab604ee9d7d8430889346 (diff) | |
| download | git-e9b5b75ca87f45292de8ecde5d4d0512ac9542cd.tar.xz | |
Merge branch 'jc/diff'
* jc/diff:
Libified diff-index: backward compatibility fix.
Libify diff-index.
Libify diff-files.
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1001-read-tree-m-2way.sh | 2 | ||||
| -rwxr-xr-x | t/t1002-read-tree-m-u-2way.sh | 2 | ||||
| -rwxr-xr-x | t/t4010-diff-pathspec.sh | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/t/t1001-read-tree-m-2way.sh b/t/t1001-read-tree-m-2way.sh index d0ed24275e..75e4c9a886 100755 --- a/t/t1001-read-tree-m-2way.sh +++ b/t/t1001-read-tree-m-2way.sh @@ -37,7 +37,7 @@ compare_change () { } check_cache_at () { - clean_if_empty=`git-diff-files "$1"` + clean_if_empty=`git-diff-files -- "$1"` case "$clean_if_empty" in '') echo "$1: clean" ;; ?*) echo "$1: dirty" ;; diff --git a/t/t1002-read-tree-m-u-2way.sh b/t/t1002-read-tree-m-u-2way.sh index 861ef4c0c6..4d175d8ea1 100755 --- a/t/t1002-read-tree-m-u-2way.sh +++ b/t/t1002-read-tree-m-u-2way.sh @@ -20,7 +20,7 @@ compare_change () { } check_cache_at () { - clean_if_empty=`git-diff-files "$1"` + clean_if_empty=`git-diff-files -- "$1"` case "$clean_if_empty" in '') echo "$1: clean" ;; ?*) echo "$1: dirty" ;; diff --git a/t/t4010-diff-pathspec.sh b/t/t4010-diff-pathspec.sh index 8db329d7ff..9e1544df9d 100755 --- a/t/t4010-diff-pathspec.sh +++ b/t/t4010-diff-pathspec.sh @@ -28,7 +28,7 @@ cat >expected <<\EOF EOF test_expect_success \ 'limit to path should show nothing' \ - 'git-diff-index --cached $tree path >current && + 'git-diff-index --cached $tree -- path >current && compare_diff_raw current expected' cat >expected <<\EOF @@ -36,7 +36,7 @@ cat >expected <<\EOF EOF test_expect_success \ 'limit to path1 should show path1/file1' \ - 'git-diff-index --cached $tree path1 >current && + 'git-diff-index --cached $tree -- path1 >current && compare_diff_raw current expected' cat >expected <<\EOF @@ -44,7 +44,7 @@ cat >expected <<\EOF EOF test_expect_success \ 'limit to path1/ should show path1/file1' \ - 'git-diff-index --cached $tree path1/ >current && + 'git-diff-index --cached $tree -- path1/ >current && compare_diff_raw current expected' cat >expected <<\EOF @@ -52,14 +52,14 @@ cat >expected <<\EOF EOF test_expect_success \ 'limit to file0 should show file0' \ - 'git-diff-index --cached $tree file0 >current && + 'git-diff-index --cached $tree -- file0 >current && compare_diff_raw current expected' cat >expected <<\EOF EOF test_expect_success \ 'limit to file0/ should emit nothing.' \ - 'git-diff-index --cached $tree file0/ >current && + 'git-diff-index --cached $tree -- file0/ >current && compare_diff_raw current expected' test_done |