After replacing the whitespace test with a test and fix based on git apply's --whitespace=fix option, a few additional cleanups were identified. Signed-off-by: Jon Seymour <jon.seymour@xxxxxxxxx> --- t/t0100-previous.sh | 1 - t/t1008-read-tree-overlay.sh | 1 - t/t1009-read-tree-new-index.sh | 1 - t/t1505-rev-parse-last.sh | 2 -- t/t2009-checkout-statinfo.sh | 1 - t/t2203-add-intent.sh | 1 - t/t6011-rev-list-with-bad-commit.sh | 1 - t/t7700-repack.sh | 1 - t/t9121-git-svn-fetch-renamed-dir.sh | 1 - t/t9122-git-svn-author.sh | 2 +- t/t9123-git-svn-rebuild-with-rewriteroot.sh | 1 - 11 files changed, 1 insertions(+), 12 deletions(-) diff --git a/t/t0100-previous.sh b/t/t0100-previous.sh index 315b9b3..fbdc124 100755 --- a/t/t0100-previous.sh +++ b/t/t0100-previous.sh @@ -46,4 +46,3 @@ test_expect_success 'merge @{-1} when there is not enough switches yet' ' ' test_done - diff --git a/t/t1008-read-tree-overlay.sh b/t/t1008-read-tree-overlay.sh index 4c50ed9..bce158b 100755 --- a/t/t1008-read-tree-overlay.sh +++ b/t/t1008-read-tree-overlay.sh @@ -29,4 +29,3 @@ test_expect_success 'multi-read' ' ' test_done - diff --git a/t/t1009-read-tree-new-index.sh b/t/t1009-read-tree-new-index.sh index 59b3aa4..6fd4827 100755 --- a/t/t1009-read-tree-new-index.sh +++ b/t/t1009-read-tree-new-index.sh @@ -22,4 +22,3 @@ test_expect_success 'empty index file' ' ' test_done - diff --git a/t/t1505-rev-parse-last.sh b/t/t1505-rev-parse-last.sh index d709ecf..caef359 100755 --- a/t/t1505-rev-parse-last.sh +++ b/t/t1505-rev-parse-last.sh @@ -65,5 +65,3 @@ test_expect_success '@{-3} fails' ' ' test_done - - diff --git a/t/t2009-checkout-statinfo.sh b/t/t2009-checkout-statinfo.sh index f3c2152..8688cf6 100755 --- a/t/t2009-checkout-statinfo.sh +++ b/t/t2009-checkout-statinfo.sh @@ -49,4 +49,3 @@ test_expect_success 'path checkout' ' ' test_done - diff --git a/t/t2203-add-intent.sh b/t/t2203-add-intent.sh index 58a3299..2c849a9 100755 --- a/t/t2203-add-intent.sh +++ b/t/t2203-add-intent.sh @@ -61,4 +61,3 @@ test_expect_success 'can "commit -a" with an i-t-a entry' ' ' test_done - diff --git a/t/t6011-rev-list-with-bad-commit.sh b/t/t6011-rev-list-with-bad-commit.sh index e51eb41..fdbfb9a 100755 --- a/t/t6011-rev-list-with-bad-commit.sh +++ b/t/t6011-rev-list-with-bad-commit.sh @@ -57,4 +57,3 @@ test_expect_success 'first commit is still available' \ ' test_done - diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh index d954b84..0e3f8d5 100755 --- a/t/t7700-repack.sh +++ b/t/t7700-repack.sh @@ -165,4 +165,3 @@ test_expect_success 'objects made unreachable by grafts only are kept' ' ' test_done - diff --git a/t/t9121-git-svn-fetch-renamed-dir.sh b/t/t9121-git-svn-fetch-renamed-dir.sh index 000cad3..ff3af03 100755 --- a/t/t9121-git-svn-fetch-renamed-dir.sh +++ b/t/t9121-git-svn-fetch-renamed-dir.sh @@ -17,4 +17,3 @@ test_expect_success 'init and fetch repository' ' ' test_done - diff --git a/t/t9122-git-svn-author.sh b/t/t9122-git-svn-author.sh index 30013b7..002c62f 100755 --- a/t/t9122-git-svn-author.sh +++ b/t/t9122-git-svn-author.sh @@ -75,7 +75,7 @@ test_expect_success 'interact with it via git svn' ' ( cd work.svn && svn_cmd up && - + test $(svn_cmd log -r2:2 | wc -l) = 5 && test $(svn_cmd log -r4:4 | wc -l) = 7 ) diff --git a/t/t9123-git-svn-rebuild-with-rewriteroot.sh b/t/t9123-git-svn-rebuild-with-rewriteroot.sh index fd81847..b535ca1 100755 --- a/t/t9123-git-svn-rebuild-with-rewriteroot.sh +++ b/t/t9123-git-svn-rebuild-with-rewriteroot.sh @@ -29,4 +29,3 @@ test_expect_success 'rebuild rev_map' ' ' test_done - -- 1.7.6.411.gf4ef -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html