This file was edited by applying: expand -i | unexpand --first-only | sed "s/ *$//" to the file. No change to test outputs or status code was observed. Signed-off-by: Jon Seymour <jon.seymour@xxxxxxxxx> --- t/t7004-tag.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh index 097ce2b..1ae978c 100755 --- a/t/t7004-tag.sh +++ b/t/t7004-tag.sh @@ -1239,7 +1239,7 @@ test_expect_success 'checking that third commit has no tags' " test_expect_success 'creating simple branch' ' git branch stable v2.0 && - git checkout stable && + git checkout stable && echo foo-3.0 > foo && git commit foo -m fourth && git tag v3.0 @@ -1258,7 +1258,7 @@ test_expect_success 'checking that branch head only has one tag' " test_expect_success 'merging original branch into this branch' ' git merge --strategy=ours master && - git tag v4.0 + git tag v4.0 ' cat > expected <<EOF -- 1.7.6.362.gf0e6 -- 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