diff options
author | Jeff King <peff@peff.net> | 2015-03-20 06:12:37 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-03-20 10:20:16 -0700 |
commit | 53350a35a3c29417dfc64ae2b0d7a16ba43d1239 (patch) | |
tree | bc56756a5f7c5b57515c3481acc476c9692073de /t/t4104-apply-boundary.sh | |
parent | 9ddc5ac97ecdd03ceda4b6e3ff20a7524a9f0f8d (diff) | |
download | git-53350a35a3c29417dfc64ae2b0d7a16ba43d1239.tar.gz |
t: avoid using ":" for comments
The ":" is not a comment marker, but rather a noop command.
Using it as a comment like:
: do something
cmd1 &&
: something else
cmd2
breaks the &&-chain, and we would fail to notice if "cmd1"
failed in this instance. We can just use regular "#"
comments instead.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4104-apply-boundary.sh')
-rwxr-xr-x | t/t4104-apply-boundary.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/t/t4104-apply-boundary.sh b/t/t4104-apply-boundary.sh index c97aad186e..497afdc6b4 100755 --- a/t/t4104-apply-boundary.sh +++ b/t/t4104-apply-boundary.sh @@ -18,7 +18,7 @@ test_expect_success setup ' cat victim >original && git update-index --add victim && - : add to the head + # add to the head for i in a b '"$L"' y do echo $i @@ -27,7 +27,7 @@ test_expect_success setup ' git diff victim >add-a-patch.with && git diff --unified=0 >add-a-patch.without && - : insert at line two + # insert at line two for i in b a '"$L"' y do echo $i @@ -36,7 +36,7 @@ test_expect_success setup ' git diff victim >insert-a-patch.with && git diff --unified=0 >insert-a-patch.without && - : modify at the head + # modify at the head for i in a '"$L"' y do echo $i @@ -45,16 +45,16 @@ test_expect_success setup ' git diff victim >mod-a-patch.with && git diff --unified=0 >mod-a-patch.without && - : remove from the head + # remove from the head for i in '"$L"' y do echo $i done >victim && cat victim >del-a-expect && - git diff victim >del-a-patch.with + git diff victim >del-a-patch.with && git diff --unified=0 >del-a-patch.without && - : add to the tail + # add to the tail for i in b '"$L"' y z do echo $i @@ -63,7 +63,7 @@ test_expect_success setup ' git diff victim >add-z-patch.with && git diff --unified=0 >add-z-patch.without && - : modify at the tail + # modify at the tail for i in b '"$L"' z do echo $i @@ -72,7 +72,7 @@ test_expect_success setup ' git diff victim >mod-z-patch.with && git diff --unified=0 >mod-z-patch.without && - : remove from the tail + # remove from the tail for i in b '"$L"' do echo $i @@ -81,7 +81,7 @@ test_expect_success setup ' git diff victim >del-z-patch.with && git diff --unified=0 >del-z-patch.without - : done + # done ' for with in with without |