diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-20 18:33:48 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-20 18:33:48 (GMT) |
| commit | 14677d25ab50efcf57621ae69d6ba858a5f86165 (patch) | |
| tree | c480f4a1ac902ab01d430b00e3dfbd2093b30d7a /t/t9300-fast-import.sh | |
| parent | 34f229790dcc7c7dc61bc37532f88fca39e36de2 (diff) | |
| parent | d3c6751b18170276f80e3578d16877d43ad22709 (diff) | |
| download | git-14677d25ab50efcf57621ae69d6ba858a5f86165.zip git-14677d25ab50efcf57621ae69d6ba858a5f86165.tar.gz git-14677d25ab50efcf57621ae69d6ba858a5f86165.tar.bz2 | |
Merge branch 'ab/test-must-be-empty-for-master'
Test updates.
* ab/test-must-be-empty-for-master:
tests: make use of the test_must_be_empty function
Diffstat (limited to 't/t9300-fast-import.sh')
| -rwxr-xr-x | t/t9300-fast-import.sh | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index fac33e5..40fe7e4 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -2191,12 +2191,11 @@ test_expect_success 'R: --import-marks-if-exists' ' test_expect_success 'R: feature import-marks-if-exists' ' rm -f io.marks && - >expect && git fast-import --export-marks=io.marks <<-\EOF && feature import-marks-if-exists=not_io.marks EOF - test_cmp expect io.marks && + test_must_be_empty io.marks && blob=$(echo hi | git hash-object --stdin) && @@ -2227,13 +2226,11 @@ test_expect_success 'R: feature import-marks-if-exists' ' EOF test_cmp expect io.marks && - >expect && - git fast-import --import-marks-if-exists=not_io.marks \ --export-marks=io.marks <<-\EOF && feature import-marks-if-exists=io.marks EOF - test_cmp expect io.marks + test_must_be_empty io.marks ' test_expect_success 'R: import to output marks works without any content' ' |