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 | 38 ++++++++++++++++++++------------------ 1 files changed, 20 insertions(+), 18 deletions(-) diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 04e4f6d..ef432e7 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -1162,16 +1162,16 @@ M 160000 :6 sub INPUT_END -test_expect_success \ - 'P: supermodule & submodule mix' \ - 'git fast-import <input && - git checkout subuse1 && - rm -rf sub && mkdir sub && (cd sub && - git init && - git fetch --update-head-ok .. refs/heads/sub:refs/heads/master && - git checkout master) && - git submodule init && - git submodule update' +test_expect_success 'P: supermodule & submodule mix' ' + git fast-import <input && + git checkout subuse1 && + rm -rf sub && mkdir sub && (cd sub && + git init && + git fetch --update-head-ok .. refs/heads/sub:refs/heads/master && + git checkout master) && + git submodule init && + git submodule update +' SUBLAST=$(git rev-parse --verify sub) SUBPREV=$(git rev-parse --verify sub^) @@ -1204,12 +1204,12 @@ M 160000 $SUBLAST sub INPUT_END -test_expect_success \ - 'P: verbatim SHA gitlinks' \ - 'git branch -D sub && - git gc && git prune && - git fast-import <input && - test $(git rev-parse --verify subuse2) = $(git rev-parse --verify subuse1)' +test_expect_success 'P: verbatim SHA gitlinks' ' + git branch -D sub && + git gc && git prune && + git fast-import <input && + test $(git rev-parse --verify subuse2) = $(git rev-parse --verify subuse1) +' test_tick cat >input <<INPUT_END @@ -1229,7 +1229,8 @@ DATA INPUT_END test_expect_success 'P: fail on inline gitlink' ' - test_must_fail git fast-import <input' + test_must_fail git fast-import <input +' test_tick cat >input <<INPUT_END @@ -1252,7 +1253,8 @@ M 160000 :1 sub INPUT_END test_expect_success 'P: fail on blob mark in gitlink' ' - test_must_fail git fast-import <input' + test_must_fail git fast-import <input +' ### ### series Q (notes) -- 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