See "t9300 (fast-import), series A: re-indent". Cc: Shawn O. Pearce <spearce@xxxxxxxxxxx> Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxx> --- t/t9300-fast-import.sh | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index a2b8950..f8856b4 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -346,17 +346,17 @@ M 755 $newf file2/newf D file3 INPUT_END -test_expect_success \ - 'C: incremental import create pack from stdin' \ - 'git fast-import <input && - git whatchanged branch' -test_expect_success \ - 'C: verify pack' \ - 'verify_packs' -test_expect_success \ - 'C: validate reuse existing blob' \ - 'test $newf = `git rev-parse --verify branch:file2/newf` - test $oldf = `git rev-parse --verify branch:file2/oldf`' +test_expect_success 'C: incremental import create pack from stdin' ' + git fast-import <input && + git whatchanged branch +' +test_expect_success 'C: verify pack' ' + verify_packs +' +test_expect_success 'C: validate reuse existing blob' ' + test $newf = `git rev-parse --verify branch:file2/newf` + test $oldf = `git rev-parse --verify branch:file2/oldf` +' cat >expect <<EOF parent `git rev-parse --verify master^0` @@ -365,10 +365,10 @@ committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE second EOF -test_expect_success \ - 'C: verify commit' \ - 'git cat-file commit branch | sed 1d >actual && - test_cmp expect actual' +test_expect_success 'C: verify commit' ' + git cat-file commit branch | sed 1d >actual && + test_cmp expect actual +' cat >expect <<EOF :000000 100755 $zeroes $newf A file2/newf @@ -376,9 +376,9 @@ cat >expect <<EOF :100644 000000 $file3_id $zeroes D file3 EOF git diff-tree -M -r master branch >actual -test_expect_success \ - 'C: validate rename result' \ - 'compare_diff_raw expect actual' +test_expect_success 'C: validate rename result' ' + compare_diff_raw expect actual +' ### ### series D -- 1.7.2.3 -- 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