diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-19 17:02:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-19 17:02:22 -0700 |
| commit | 0081e36c9dc3c201e22f12ebebadfff88fa32b91 (patch) | |
| tree | 5723eac1ee37bf3ae95e7d970b54ac7a6f2644ce /t/t4002-diff-basic.sh | |
| parent | Merge branch 'jc/apply' (diff) | |
| parent | read-tree -m -u: do not overwrite or remove untracked working tree files. (diff) | |
| download | tgif-0081e36c9dc3c201e22f12ebebadfff88fa32b91.tar.xz | |
Merge branch 'jc/read-tree-safety'
* jc/read-tree-safety:
read-tree -m -u: do not overwrite or remove untracked working tree files.
Diffstat (limited to 't/t4002-diff-basic.sh')
| -rwxr-xr-x | t/t4002-diff-basic.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t4002-diff-basic.sh b/t/t4002-diff-basic.sh index 769274aa51..56eda63fc2 100755 --- a/t/t4002-diff-basic.sh +++ b/t/t4002-diff-basic.sh @@ -191,7 +191,7 @@ test_expect_success \ 'rm -fr Z [A-Z][A-Z] && git-read-tree $tree_A && git-checkout-index -f -a && - git-read-tree -m $tree_O || return 1 + git-read-tree --reset $tree_O || return 1 git-update-index --refresh >/dev/null ;# this can exit non-zero git-diff-files >.test-a && cmp_diff_files_output .test-a .test-recursive-OA' @@ -201,7 +201,7 @@ test_expect_success \ 'rm -fr Z [A-Z][A-Z] && git-read-tree $tree_B && git-checkout-index -f -a && - git-read-tree -m $tree_O || return 1 + git-read-tree --reset $tree_O || return 1 git-update-index --refresh >/dev/null ;# this can exit non-zero git-diff-files >.test-a && cmp_diff_files_output .test-a .test-recursive-OB' @@ -211,7 +211,7 @@ test_expect_success \ 'rm -fr Z [A-Z][A-Z] && git-read-tree $tree_B && git-checkout-index -f -a && - git-read-tree -m $tree_A || return 1 + git-read-tree --reset $tree_A || return 1 git-update-index --refresh >/dev/null ;# this can exit non-zero git-diff-files >.test-a && cmp_diff_files_output .test-a .test-recursive-AB' |