diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-02-22 16:12:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-22 16:12:43 -0800 |
| commit | d68fccef86af1ceb5ae3a9abb02c8fe4f6ff3317 (patch) | |
| tree | 020527039643bd7dcf1c498e6d1c90b2aabc612d /t/t4008-diff-break-rewrite.sh | |
| parent | Merge branch 'ab/diff-deferred-free' (diff) | |
| parent | test-lib-functions: assert correct parameter count (diff) | |
| download | tgif-d68fccef86af1ceb5ae3a9abb02c8fe4f6ff3317.tar.xz | |
Merge branch 'ab/test-lib'
Test framework clean-up.
* ab/test-lib:
test-lib-functions: assert correct parameter count
test-lib-functions: remove bug-inducing "diagnostics" helper param
test libs: rename "diff-lib" to "lib-diff"
t/.gitattributes: sort lines
test-lib-functions: move function to lib-bitmap.sh
test libs: rename gitweb-lib.sh to lib-gitweb.sh
test libs: rename bundle helper to "lib-bundle.sh"
test-lib-functions: remove generate_zero_bytes() wrapper
test-lib-functions: move test_set_index_version() to its user
test lib: change "error" to "BUG" as appropriate
test-lib: remove check_var_migration
Diffstat (limited to 't/t4008-diff-break-rewrite.sh')
| -rwxr-xr-x | t/t4008-diff-break-rewrite.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t4008-diff-break-rewrite.sh b/t/t4008-diff-break-rewrite.sh index b1ccd4102e..2299f27511 100755 --- a/t/t4008-diff-break-rewrite.sh +++ b/t/t4008-diff-break-rewrite.sh @@ -22,11 +22,11 @@ With -B, this should be detected as two complete rewrites. Further, with -B and -M together, these should turn into two renames. ' . ./test-lib.sh -. "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash +. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash test_expect_success setup ' - cat "$TEST_DIRECTORY"/diff-lib/README >file0 && - cat "$TEST_DIRECTORY"/diff-lib/COPYING >file1 && + cat "$TEST_DIRECTORY"/lib-diff/README >file0 && + cat "$TEST_DIRECTORY"/lib-diff/COPYING >file1 && blob0_id=$(git hash-object file0) && blob1_id=$(git hash-object file1) && git update-index --add file0 file1 && |