From 5f2aa73f60a281463d0b76d91756da7d6d4366bc Mon Sep 17 00:00:00 2001 From: Taylor Blau Date: Mon, 16 Jul 2018 16:52:10 -0500 Subject: [PATCH] test/test-migrate-fixtures.sh: avoid newline in a.txt Newlines can cause problems with the 'calc_oid()' function, which ordinarily isn't a problem since we don't inspect the contents of a.txt in order to calculate an OID in any of the test/test-migrate-*.sh tests. In the following commit, this will change. So, without loss of generality, let's change the contents of a.txt to no longer contain a newline. --- test/test-migrate-fixtures.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/test-migrate-fixtures.sh b/test/test-migrate-fixtures.sh index 93b77c93..627f60f1 100755 --- a/test/test-migrate-fixtures.sh +++ b/test/test-migrate-fixtures.sh @@ -559,7 +559,7 @@ setup_local_branch_with_symlink() { # \ # refs/heads/master # -# - Commit 'A' has the contents "a.txt\n" in a.txt, and marks a.txt as unclean +# - Commit 'A' has the contents "a.txt in a.txt, and marks a.txt as unclean # in the working copy. setup_local_branch_with_dirty_copy() { set -e @@ -567,12 +567,12 @@ setup_local_branch_with_dirty_copy() { reponame="migrate-single-local-branch-with-dirty-copy" remove_and_create_local_repo "$reponame" - echo "a.txt" > a.txt + printf "a.txt" > a.txt git add a.txt git commit -m "initial commit" - echo "2" >> a.txt + printf "2" >> a.txt } # make_bare converts the existing full checkout of a repository into a bare one,