See "t9300 (fast-import), series A: re-indent". Cc: Shawn O. Pearce <spearce@xxxxxxxxxxx> Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxx> --- That's all for now. Sorry for the dull read. Be seeing you, Jonathan t/t9300-fast-import.sh | 72 ++++++++++++++++++++++++------------------------ 1 files changed, 36 insertions(+), 36 deletions(-) diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 970f594..6c629b4 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -1609,35 +1609,35 @@ hi EOF -test_expect_success \ - 'R: export-marks feature results in a marks file being created' \ - 'cat input | git fast-import && - grep :1 git.marks' +test_expect_success 'R: export-marks feature results in a marks file being created' ' + cat input | git fast-import && + grep :1 git.marks +' -test_expect_success \ - 'R: export-marks options can be overriden by commandline options' \ - 'cat input | git fast-import --export-marks=other.marks && - grep :1 other.marks' +test_expect_success 'R: export-marks options can be overriden by commandline options' ' + cat input | git fast-import --export-marks=other.marks && + grep :1 other.marks +' cat >input << EOF feature import-marks=marks.out feature export-marks=marks.new EOF -test_expect_success \ - 'R: import to output marks works without any content' \ - 'cat input | git fast-import && - test_cmp marks.out marks.new' +test_expect_success 'R: import to output marks works without any content' ' + cat input | git fast-import && + test_cmp marks.out marks.new +' cat >input <<EOF feature import-marks=nonexistant.marks feature export-marks=marks.new EOF -test_expect_success \ - 'R: import marks prefers commandline marks file over the stream' \ - 'cat input | git fast-import --import-marks=marks.out && - test_cmp marks.out marks.new' +test_expect_success 'R: import marks prefers commandline marks file over the stream' ' + cat input | git fast-import --import-marks=marks.out && + test_cmp marks.out marks.new +' cat >input <<EOF @@ -1700,7 +1700,7 @@ test_expect_success 'R: die on unknown option' ' test_must_fail git fast-import <input ' -test_expect_success 'R: unknown commandline options are rejected' '\ +test_expect_success 'R: unknown commandline options are rejected' ' test_must_fail git fast-import --non-existing-option < /dev/null ' @@ -1735,29 +1735,29 @@ INPUT_END cat expect >>input echo >>input -test_expect_success \ - 'R: blob bigger than threshold' \ - 'test_create_repo R && - git --git-dir=R/.git fast-import --big-file-threshold=1 <input' -test_expect_success \ - 'R: verify created pack' \ - '( +test_expect_success 'R: blob bigger than threshold' ' + test_create_repo R && + git --git-dir=R/.git fast-import --big-file-threshold=1 <input +' +test_expect_success 'R: verify created pack' ' + ( for p in R/.git/objects/pack/*.pack do git verify-pack -v $p || exit done + ) >verify +' - ) >verify' -test_expect_success \ - 'R: verify written objects' \ - 'git --git-dir=R/.git cat-file blob big-file:big1 >actual && - test_cmp expect actual && - a=$(git --git-dir=R/.git rev-parse big-file:big1) && - b=$(git --git-dir=R/.git rev-parse big-file:big2) && - test $a = $b' -test_expect_success \ - 'R: blob appears only once' \ - 'n=$(grep $a verify | wc -l) && - test 1 = $n' +test_expect_success 'R: verify written objects' ' + git --git-dir=R/.git cat-file blob big-file:big1 >actual && + test_cmp expect actual && + a=$(git --git-dir=R/.git rev-parse big-file:big1) && + b=$(git --git-dir=R/.git rev-parse big-file:big2) && + test $a = $b +' +test_expect_success 'R: blob appears only once' ' + n=$(grep $a verify | wc -l) && + test 1 = $n +' test_done -- 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