From: Marcelo Machado Lage Date: Sat, 11 Jul 2026 16:04:46 +0000 (-0300) Subject: t9811: break long && chains into multiple lines X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbe8efd6632d250b1d2638013b70f08bbc587ad6;p=thirdparty%2Fgit.git t9811: break long && chains into multiple lines Rewrite single-line && chains by breaking them into multiple lines. Co-authored-by: Vinicius Lira de Freitas Signed-off-by: Vinicius Lira de Freitas Signed-off-by: Marcelo Machado Lage Signed-off-by: Junio C Hamano --- diff --git a/t/t9811-git-p4-label-import.sh b/t/t9811-git-p4-label-import.sh index 7614dfbd95..9c161036f2 100755 --- a/t/t9811-git-p4-label-import.sh +++ b/t/t9811-git-p4-label-import.sh @@ -64,7 +64,9 @@ test_expect_success 'basic p4 labels' ' git checkout TAG_F1_ONLY && ! test -f f2 && git checkout TAG_WITH\$_SHELL_CHAR && - test -f f1 && test -f f2 && test -f file_with_\$metachar && + test -f f1 && + test -f f2 && + test -f file_with_\$metachar && git show TAG_LONG_LABEL | grep -q "A Label second line" ) @@ -231,17 +233,25 @@ test_expect_success 'importing labels with missing revisions' ' P4CLIENT=missing-revision && client_view "//depot/missing-revision/... //missing-revision/..." && cd "$cli" && - >f1 && p4 add f1 && p4 submit -d "start" && + >f1 && + p4 add f1 && + p4 submit -d "start" && p4 tag -l TAG_S0 ... && - >f2 && p4 add f2 && p4 submit -d "second" && + >f2 && + p4 add f2 && + p4 submit -d "second" && startrev=$(p4_head_revision //depot/missing-revision/...) && - >f3 && p4 add f3 && p4 submit -d "third" && + >f3 && + p4 add f3 && + p4 submit -d "third" && - p4 edit f2 && date >f2 && p4 submit -d "change" f2 && + p4 edit f2 && + date >f2 && + p4 submit -d "change" f2 && endrev=$(p4_head_revision //depot/missing-revision/...) &&