{"thread":{"id":"54603","subject":"[PATCH 0/6] (Mostly whitespace) cleanups in preparation for renaming the default main branch","startedAt":"2020-11-09T00:09:31Z","lastAt":"2020-11-09T00:09:38Z","messageCount":7,"participants":["Johannes Schindelin via GitGitGadget"],"isPatch":true,"patchVersion":1,"patchTotal":6},"messages":[{"id":"409367","messageId":"pull.784.git.1604880565.gitgitgadget@gmail.com","threadId":"54603","inReplyTo":null,"subject":"[PATCH 0/6] (Mostly whitespace) cleanups in preparation for renaming the default main branch","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-11-09T00:09:19Z","receivedAt":"2020-11-09T00:09:31Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"This topic branch mostly brings whitespace fixes, so that the \nuse-main-as-default-branch-name patch series will avoid being flagged by\nGit's new check-whitespace GitHub workflow.\n\nJohannes Schindelin (6):\n  t1004: insert missing \"branch\" in a message\n  t3406: indent with tabs, not spaces\n  t3427: adjust stale comment\n  t5400,t5402: consistently indent with tabs, not with spaces\n  t5570: remove trailing padding\n  t9603: use tabs for indentation\n\n t/t1004-read-tree-m-u-wf.sh    |   2 +-\n t/t3406-rebase-message.sh      |  16 ++--\n t/t3427-rebase-subtree.sh      |   2 +-\n t/t5400-send-pack.sh           | 153 +++++++++++++++++----------------\n t/t5402-post-merge-hook.sh     |  16 ++--\n t/t5570-git-daemon.sh          |  12 +--\n t/t9603-cvsimport-patchsets.sh |  24 +++---\n 7 files changed, 113 insertions(+), 112 deletions(-)\n\n\nbase-commit: 7f7ebe054af6d831b999d6c2241b9227c4e4e08d\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-784%2Fdscho%2Fmain-branch-preliminary-cleanups-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-784/dscho/main-branch-preliminary-cleanups-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/784\n-- \ngitgitgadget\n"},{"id":"409368","messageId":"edf42c4df7a94d16234cb6c19765d0eba9f5049c.1604880565.git.gitgitgadget@gmail.com","threadId":"54603","inReplyTo":"pull.784.git.1604880565.gitgitgadget@gmail.com","subject":"[PATCH 2/6] t3406: indent with tabs, not spaces","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-11-09T00:09:21Z","receivedAt":"2020-11-09T00:09:32Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin <johannes.schindelin@gmx.de>\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n t/t3406-rebase-message.sh | 16 ++++++++--------\n 1 file changed, 8 insertions(+), 8 deletions(-)\n\ndiff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh\nindex 927a4f4a4e..4afc528165 100755\n--- a/t/t3406-rebase-message.sh\n+++ b/t/t3406-rebase-message.sh\n@@ -46,22 +46,22 @@ test_expect_success 'rebase fast-forward to master' '\n \n test_expect_success 'rebase --stat' '\n \tgit reset --hard start &&\n-        git rebase --stat master >diffstat.txt &&\n-        grep \"^ fileX |  *1 +$\" diffstat.txt\n+\tgit rebase --stat master >diffstat.txt &&\n+\tgrep \"^ fileX |  *1 +$\" diffstat.txt\n '\n \n test_expect_success 'rebase w/config rebase.stat' '\n \tgit reset --hard start &&\n-        git config rebase.stat true &&\n-        git rebase master >diffstat.txt &&\n-        grep \"^ fileX |  *1 +$\" diffstat.txt\n+\tgit config rebase.stat true &&\n+\tgit rebase master >diffstat.txt &&\n+\tgrep \"^ fileX |  *1 +$\" diffstat.txt\n '\n \n test_expect_success 'rebase -n overrides config rebase.stat config' '\n \tgit reset --hard start &&\n-        git config rebase.stat true &&\n-        git rebase -n master >diffstat.txt &&\n-        ! grep \"^ fileX |  *1 +$\" diffstat.txt\n+\tgit config rebase.stat true &&\n+\tgit rebase -n master >diffstat.txt &&\n+\t! grep \"^ fileX |  *1 +$\" diffstat.txt\n '\n \n # Output to stderr:\n-- \ngitgitgadget\n\n"},{"id":"409369","messageId":"1340feb2dfceaf9215495af2fd970d30866f7a76.1604880565.git.gitgitgadget@gmail.com","threadId":"54603","inReplyTo":"pull.784.git.1604880565.gitgitgadget@gmail.com","subject":"[PATCH 3/6] t3427: adjust stale comment","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-11-09T00:09:22Z","receivedAt":"2020-11-09T00:09:33Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin <johannes.schindelin@gmx.de>\n\nIn b6211b89eb3 (tests: avoid variations of the `master` branch name,\n2020-09-26), the `master[123]` branch names were renamed to\n`topic_[123]`. A non-literal mention of the corresponding files was\nmissed in that commit.\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n t/t3427-rebase-subtree.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh\nindex 2a7d958ea7..5839719ba1 100755\n--- a/t/t3427-rebase-subtree.sh\n+++ b/t/t3427-rebase-subtree.sh\n@@ -19,7 +19,7 @@ commit_message() {\n #                             \\\n # README ---------------------- Add subproject master - topic_4 - files_subtree/topic_5\n #\n-# Where the merge moves the files master[123].t into the subdirectory\n+# Where the merge moves the files topic_[123].t into the subdirectory\n # files_subtree/ and topic_4 as well as files_subtree/topic_5 add files to that\n # directory directly.\n #\n-- \ngitgitgadget\n\n"},{"id":"409370","messageId":"1db6df30031bd13e3e01fe23a957c6841b9c1bf1.1604880565.git.gitgitgadget@gmail.com","threadId":"54603","inReplyTo":"pull.784.git.1604880565.gitgitgadget@gmail.com","subject":"[PATCH 1/6] t1004: insert missing \"branch\" in a message","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-11-09T00:09:20Z","receivedAt":"2020-11-09T00:09:35Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin <johannes.schindelin@gmx.de>\n\nThe message in question reads awkward with the name \"master\", but will\nbe even more confusing once that is renamed to \"main\". Let's adjust it\nin advance of said rename.\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n t/t1004-read-tree-m-u-wf.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/t/t1004-read-tree-m-u-wf.sh b/t/t1004-read-tree-m-u-wf.sh\nindex c13578a635..181956b241 100755\n--- a/t/t1004-read-tree-m-u-wf.sh\n+++ b/t/t1004-read-tree-m-u-wf.sh\n@@ -20,7 +20,7 @@ test_expect_success 'two-way setup' '\n \tgit branch side &&\n \tgit tag -f branch-point &&\n \n-\techo file2 is not tracked on the master anymore &&\n+\techo file2 is not tracked on the master branch anymore &&\n \trm -f file2 subdir/file2 &&\n \tgit update-index --remove file2 subdir/file2 &&\n \tgit commit -a -m \"master removes file2 and subdir/file2\"\n-- \ngitgitgadget\n\n"},{"id":"409371","messageId":"fa09f1de515756e41a1f16f1d62607856bf5b684.1604880565.git.gitgitgadget@gmail.com","threadId":"54603","inReplyTo":"pull.784.git.1604880565.gitgitgadget@gmail.com","subject":"[PATCH 4/6] t5400,t5402: consistently indent with tabs, not with spaces","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-11-09T00:09:23Z","receivedAt":"2020-11-09T00:09:36Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin <johannes.schindelin@gmx.de>\n\nThis patch actually prepares for the upcoming patches to replace\n`master` with `main` in these tests: we do not want those changes to be\nflagged by the new `check-whitespace` GitHub workflow (even if those\nchanges do not introduce the whitespace issues, they touch lines\naffected by those issues without fixing them).\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n t/t5400-send-pack.sh       | 153 +++++++++++++++++++------------------\n t/t5402-post-merge-hook.sh |  16 ++--\n 2 files changed, 85 insertions(+), 84 deletions(-)\n\ndiff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh\nindex b84618c925..cc86ef213e 100755\n--- a/t/t5400-send-pack.sh\n+++ b/t/t5400-send-pack.sh\n@@ -21,14 +21,15 @@ test_expect_success setup '\n \ti=0 &&\n \twhile test $i -le $cnt\n \tdo\n-\t    i=$(($i+1)) &&\n-\t    test_tick &&\n-\t    echo \"Commit #$i\" >mozart/is/pink &&\n-\t    git update-index --add mozart/is/pink &&\n-\t    tree=$(git write-tree) &&\n-\t    commit=$(echo \"Commit #$i\" | git commit-tree $tree -p $parent) &&\n-\t    git update-ref refs/tags/commit$i $commit &&\n-\t    parent=$commit || return 1\n+\t\ti=$(($i+1)) &&\n+\t\ttest_tick &&\n+\t\techo \"Commit #$i\" >mozart/is/pink &&\n+\t\tgit update-index --add mozart/is/pink &&\n+\t\ttree=$(git write-tree) &&\n+\t\tcommit=$(echo \"Commit #$i\" |\n+\t\t\t git commit-tree $tree -p $parent) &&\n+\t\tgit update-ref refs/tags/commit$i $commit &&\n+\t\tparent=$commit || return 1\n \tdone &&\n \tgit update-ref HEAD \"$commit\" &&\n \tgit clone ./. victim &&\n@@ -38,14 +39,14 @@ test_expect_success setup '\n \ti=0 &&\n \twhile test $i -le $cnt\n \tdo\n-\t    i=$(($i+1)) &&\n-\t    test_tick &&\n-\t    echo \"Rebase #$i\" >mozart/is/pink &&\n-\t    git update-index --add mozart/is/pink &&\n-\t    tree=$(git write-tree) &&\n-\t    commit=$(echo \"Rebase #$i\" | git commit-tree $tree -p $parent) &&\n-\t    git update-ref refs/tags/rebase$i $commit &&\n-\t    parent=$commit || return 1\n+\t\ti=$(($i+1)) &&\n+\t\ttest_tick &&\n+\t\techo \"Rebase #$i\" >mozart/is/pink &&\n+\t\tgit update-index --add mozart/is/pink &&\n+\t\ttree=$(git write-tree) &&\n+\t\tcommit=$(echo \"Rebase #$i\" | git commit-tree $tree -p $parent) &&\n+\t\tgit update-ref refs/tags/rebase$i $commit &&\n+\t\tparent=$commit || return 1\n \tdone &&\n \tgit update-ref HEAD \"$commit\" &&\n \techo Rebase &&\n@@ -57,11 +58,11 @@ test_expect_success 'pack the source repository' '\n '\n \n test_expect_success 'pack the destination repository' '\n-    (\n-\tcd victim &&\n-\tgit repack -a -d &&\n-\tgit prune\n-    )\n+\t(\n+\t\tcd victim &&\n+\t\tgit repack -a -d &&\n+\t\tgit prune\n+\t)\n '\n \n test_expect_success 'refuse pushing rewound head without --force' '\n@@ -85,10 +86,10 @@ test_expect_success 'push can be used to delete a ref' '\n \n test_expect_success 'refuse deleting push with denyDeletes' '\n \t(\n-\t    cd victim &&\n-\t    test_might_fail git branch -D extra &&\n-\t    git config receive.denyDeletes true &&\n-\t    git branch extra master\n+\t\tcd victim &&\n+\t\ttest_might_fail git branch -D extra &&\n+\t\tgit config receive.denyDeletes true &&\n+\t\tgit branch extra master\n \t) &&\n \ttest_must_fail git send-pack ./victim :extra master\n '\n@@ -118,9 +119,9 @@ test_expect_success 'override denyDeletes with git -c receive-pack' '\n \n test_expect_success 'denyNonFastforwards trumps --force' '\n \t(\n-\t    cd victim &&\n-\t    test_might_fail git branch -D extra &&\n-\t    git config receive.denyNonFastforwards true\n+\t\tcd victim &&\n+\t\ttest_might_fail git branch -D extra &&\n+\t\tgit config receive.denyNonFastforwards true\n \t) &&\n \tvictim_orig=$(cd victim && git rev-parse --verify master) &&\n \ttest_must_fail git send-pack --force ./victim master^:master &&\n@@ -143,16 +144,16 @@ test_expect_success 'send-pack --all sends all branches' '\n test_expect_success 'push --all excludes remote-tracking hierarchy' '\n \tmkdir parent &&\n \t(\n-\t    cd parent &&\n-\t    git init && : >file && git add file && git commit -m add\n+\t\tcd parent &&\n+\t\tgit init && : >file && git add file && git commit -m add\n \t) &&\n \tgit clone parent child &&\n \t(\n-\t    cd child && git push --all\n+\t\tcd child && git push --all\n \t) &&\n \t(\n-\t    cd parent &&\n-\t    test -z \"$(git for-each-ref refs/remotes/origin)\"\n+\t\tcd parent &&\n+\t\ttest -z \"$(git for-each-ref refs/remotes/origin)\"\n \t)\n '\n \n@@ -160,33 +161,33 @@ test_expect_success 'receive-pack runs auto-gc in remote repo' '\n \trm -rf parent child &&\n \tgit init parent &&\n \t(\n-\t    # Setup a repo with 2 packs\n-\t    cd parent &&\n-\t    echo \"Some text\" >file.txt &&\n-\t    git add . &&\n-\t    git commit -m \"Initial commit\" &&\n-\t    git repack -adl &&\n-\t    echo \"Some more text\" >>file.txt &&\n-\t    git commit -a -m \"Second commit\" &&\n-\t    git repack\n+\t\t# Setup a repo with 2 packs\n+\t\tcd parent &&\n+\t\techo \"Some text\" >file.txt &&\n+\t\tgit add . &&\n+\t\tgit commit -m \"Initial commit\" &&\n+\t\tgit repack -adl &&\n+\t\techo \"Some more text\" >>file.txt &&\n+\t\tgit commit -a -m \"Second commit\" &&\n+\t\tgit repack\n \t) &&\n \tcp -R parent child &&\n \t(\n-\t    # Set the child to auto-pack if more than one pack exists\n-\t    cd child &&\n-\t    git config gc.autopacklimit 1 &&\n-\t    git config gc.autodetach false &&\n-\t    git branch test_auto_gc &&\n-\t    # And create a file that follows the temporary object naming\n-\t    # convention for the auto-gc to remove\n-\t    : >.git/objects/tmp_test_object &&\n-\t    test-tool chmtime =-1209601 .git/objects/tmp_test_object\n+\t\t# Set the child to auto-pack if more than one pack exists\n+\t\tcd child &&\n+\t\tgit config gc.autopacklimit 1 &&\n+\t\tgit config gc.autodetach false &&\n+\t\tgit branch test_auto_gc &&\n+\t\t# And create a file that follows the temporary object naming\n+\t\t# convention for the auto-gc to remove\n+\t\t: >.git/objects/tmp_test_object &&\n+\t\ttest-tool chmtime =-1209601 .git/objects/tmp_test_object\n \t) &&\n \t(\n-\t    cd parent &&\n-\t    echo \"Even more text\" >>file.txt &&\n-\t    git commit -a -m \"Third commit\" &&\n-\t    git send-pack ../child HEAD:refs/heads/test_auto_gc\n+\t\tcd parent &&\n+\t\techo \"Even more text\" >>file.txt &&\n+\t\tgit commit -a -m \"Third commit\" &&\n+\t\tgit send-pack ../child HEAD:refs/heads/test_auto_gc\n \t) &&\n \ttest ! -e child/.git/objects/tmp_test_object\n '\n@@ -195,15 +196,15 @@ rewound_push_setup() {\n \trm -rf parent child &&\n \tmkdir parent &&\n \t(\n-\t    cd parent &&\n-\t    git init &&\n-\t    echo one >file && git add file && git commit -m one &&\n-\t    git config receive.denyCurrentBranch warn &&\n-\t    echo two >file && git commit -a -m two\n+\t\tcd parent &&\n+\t\tgit init &&\n+\t\techo one >file && git add file && git commit -m one &&\n+\t\tgit config receive.denyCurrentBranch warn &&\n+\t\techo two >file && git commit -a -m two\n \t) &&\n \tgit clone parent child &&\n \t(\n-\t    cd child && git reset --hard HEAD^\n+\t\tcd child && git reset --hard HEAD^\n \t)\n }\n \n@@ -211,16 +212,16 @@ test_expect_success 'pushing explicit refspecs respects forcing' '\n \trewound_push_setup &&\n \tparent_orig=$(cd parent && git rev-parse --verify master) &&\n \t(\n-\t    cd child &&\n-\t    test_must_fail git send-pack ../parent \\\n-\t\trefs/heads/master:refs/heads/master\n+\t\tcd child &&\n+\t\ttest_must_fail git send-pack ../parent \\\n+\t\t\trefs/heads/master:refs/heads/master\n \t) &&\n \tparent_head=$(cd parent && git rev-parse --verify master) &&\n \ttest \"$parent_orig\" = \"$parent_head\" &&\n \t(\n-\t    cd child &&\n-\t    git send-pack ../parent \\\n-\t        +refs/heads/master:refs/heads/master\n+\t\tcd child &&\n+\t\tgit send-pack ../parent \\\n+\t\t\t+refs/heads/master:refs/heads/master\n \t) &&\n \tparent_head=$(cd parent && git rev-parse --verify master) &&\n \tchild_head=$(cd child && git rev-parse --verify master) &&\n@@ -231,16 +232,16 @@ test_expect_success 'pushing wildcard refspecs respects forcing' '\n \trewound_push_setup &&\n \tparent_orig=$(cd parent && git rev-parse --verify master) &&\n \t(\n-\t    cd child &&\n-\t    test_must_fail git send-pack ../parent \\\n-\t        \"refs/heads/*:refs/heads/*\"\n+\t\tcd child &&\n+\t\ttest_must_fail git send-pack ../parent \\\n+\t\t\t\"refs/heads/*:refs/heads/*\"\n \t) &&\n \tparent_head=$(cd parent && git rev-parse --verify master) &&\n \ttest \"$parent_orig\" = \"$parent_head\" &&\n \t(\n-\t    cd child &&\n-\t    git send-pack ../parent \\\n-\t        \"+refs/heads/*:refs/heads/*\"\n+\t\tcd child &&\n+\t\tgit send-pack ../parent \\\n+\t\t\t\"+refs/heads/*:refs/heads/*\"\n \t) &&\n \tparent_head=$(cd parent && git rev-parse --verify master) &&\n \tchild_head=$(cd child && git rev-parse --verify master) &&\n@@ -250,8 +251,8 @@ test_expect_success 'pushing wildcard refspecs respects forcing' '\n test_expect_success 'deny pushing to delete current branch' '\n \trewound_push_setup &&\n \t(\n-\t    cd child &&\n-\t    test_must_fail git send-pack ../parent :refs/heads/master 2>errs\n+\t\tcd child &&\n+\t\ttest_must_fail git send-pack ../parent :refs/heads/master 2>errs\n \t)\n '\n \n@@ -289,7 +290,7 @@ test_expect_success 'receive-pack de-dupes .have lines' '\n \tEOF\n \n \tGIT_TRACE_PACKET=$(pwd)/trace GIT_TEST_PROTOCOL_VERSION=0 \\\n-\t    git push \\\n+\tgit push \\\n \t\t--receive-pack=\"unset GIT_TRACE_PACKET; git-receive-pack\" \\\n \t\tfork HEAD:foo &&\n \textract_ref_advertisement <trace >refs &&\ndiff --git a/t/t5402-post-merge-hook.sh b/t/t5402-post-merge-hook.sh\nindex 6eb2ffd6ec..4aeea8f5b7 100755\n--- a/t/t5402-post-merge-hook.sh\n+++ b/t/t5402-post-merge-hook.sh\n@@ -15,7 +15,7 @@ test_expect_success setup '\n \tgit update-index a &&\n \ttree1=$(git write-tree) &&\n \tcommit1=$(echo modify | git commit-tree $tree1 -p $commit0) &&\n-        git update-ref refs/heads/master $commit0 &&\n+\tgit update-ref refs/heads/master $commit0 &&\n \tgit clone ./. clone1 &&\n \tGIT_DIR=clone1/.git git update-index --add a &&\n \tgit clone ./. clone2 &&\n@@ -23,34 +23,34 @@ test_expect_success setup '\n '\n \n for clone in 1 2; do\n-    cat >clone${clone}/.git/hooks/post-merge <<'EOF'\n+\tcat >clone${clone}/.git/hooks/post-merge <<'EOF'\n #!/bin/sh\n echo $@ >> $GIT_DIR/post-merge.args\n EOF\n-    chmod u+x clone${clone}/.git/hooks/post-merge\n+\tchmod u+x clone${clone}/.git/hooks/post-merge\n done\n \n test_expect_success 'post-merge does not run for up-to-date ' '\n-        GIT_DIR=clone1/.git git merge $commit0 &&\n+\tGIT_DIR=clone1/.git git merge $commit0 &&\n \t! test -f clone1/.git/post-merge.args\n '\n \n test_expect_success 'post-merge runs as expected ' '\n-        GIT_DIR=clone1/.git git merge $commit1 &&\n+\tGIT_DIR=clone1/.git git merge $commit1 &&\n \ttest -e clone1/.git/post-merge.args\n '\n \n test_expect_success 'post-merge from normal merge receives the right argument ' '\n-        grep 0 clone1/.git/post-merge.args\n+\tgrep 0 clone1/.git/post-merge.args\n '\n \n test_expect_success 'post-merge from squash merge runs as expected ' '\n-        GIT_DIR=clone2/.git git merge --squash $commit1 &&\n+\tGIT_DIR=clone2/.git git merge --squash $commit1 &&\n \ttest -e clone2/.git/post-merge.args\n '\n \n test_expect_success 'post-merge from squash merge receives the right argument ' '\n-        grep 1 clone2/.git/post-merge.args\n+\tgrep 1 clone2/.git/post-merge.args\n '\n \n test_done\n-- \ngitgitgadget\n\n"},{"id":"409372","messageId":"b9d7478ddd496e11d13d433c8ba1423f97881942.1604880566.git.gitgitgadget@gmail.com","threadId":"54603","inReplyTo":"pull.784.git.1604880565.gitgitgadget@gmail.com","subject":"[PATCH 5/6] t5570: remove trailing padding","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-11-09T00:09:24Z","receivedAt":"2020-11-09T00:09:36Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin <johannes.schindelin@gmx.de>\n\nTwo blocks in t5570 want to align the closing double quotes, padding\nwith spaces if needed. Since the maximum length of those lines is\ndefined by the branch name `master`, the upcoming rename to `main` would\nunalign the quotes.\n\nBut then, it is unclear how those aligned closing quotes should help\nreadability anyway, so let's just remove that padding altogether.\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n t/t5570-git-daemon.sh | 12 ++++++------\n 1 file changed, 6 insertions(+), 6 deletions(-)\n\ndiff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh\nindex 34487bbb8c..8f69a7854f 100755\n--- a/t/t5570-git-daemon.sh\n+++ b/t/t5570-git-daemon.sh\n@@ -147,18 +147,18 @@ test_remote_error()\n }\n \n msg=\"access denied or repository not exported\"\n-test_expect_success 'clone non-existent' \"test_remote_error    '$msg' clone nowhere.git    \"\n+test_expect_success 'clone non-existent' \"test_remote_error    '$msg' clone nowhere.git\"\n test_expect_success 'push disabled'      \"test_remote_error    '$msg' push  repo.git master\"\n-test_expect_success 'read access denied' \"test_remote_error -x '$msg' fetch repo.git       \"\n-test_expect_success 'not exported'       \"test_remote_error -n '$msg' fetch repo.git       \"\n+test_expect_success 'read access denied' \"test_remote_error -x '$msg' fetch repo.git\"\n+test_expect_success 'not exported'       \"test_remote_error -n '$msg' fetch repo.git\"\n \n stop_git_daemon\n start_git_daemon --informative-errors\n \n-test_expect_success 'clone non-existent' \"test_remote_error    'no such repository'      clone nowhere.git    \"\n+test_expect_success 'clone non-existent' \"test_remote_error    'no such repository'      clone nowhere.git\"\n test_expect_success 'push disabled'      \"test_remote_error    'service not enabled'     push  repo.git master\"\n-test_expect_success 'read access denied' \"test_remote_error -x 'no such repository'      fetch repo.git       \"\n-test_expect_success 'not exported'       \"test_remote_error -n 'repository not exported' fetch repo.git       \"\n+test_expect_success 'read access denied' \"test_remote_error -x 'no such repository'      fetch repo.git\"\n+test_expect_success 'not exported'       \"test_remote_error -n 'repository not exported' fetch repo.git\"\n \n stop_git_daemon\n start_git_daemon --interpolated-path=\"$GIT_DAEMON_DOCUMENT_ROOT_PATH/%H%D\"\n-- \ngitgitgadget\n\n"},{"id":"409373","messageId":"36ed176a4e0ca19a38f1fb968ac8bac83a288fd4.1604880566.git.gitgitgadget@gmail.com","threadId":"54603","inReplyTo":"pull.784.git.1604880565.gitgitgadget@gmail.com","subject":"[PATCH 6/6] t9603: use tabs for indentation","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-11-09T00:09:25Z","receivedAt":"2020-11-09T00:09:38Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin <johannes.schindelin@gmx.de>\n\nThis patch will let the new `check-whitespace` GitHub workflow be happy\nwith the upcoming patch series that wants to search-and-replace `master`\nwith `main` in t9603 and some other test scripts.\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n t/t9603-cvsimport-patchsets.sh | 24 ++++++++++++------------\n 1 file changed, 12 insertions(+), 12 deletions(-)\n\ndiff --git a/t/t9603-cvsimport-patchsets.sh b/t/t9603-cvsimport-patchsets.sh\nindex 3e64b11eac..e7a91611dc 100755\n--- a/t/t9603-cvsimport-patchsets.sh\n+++ b/t/t9603-cvsimport-patchsets.sh\n@@ -17,23 +17,23 @@ test_description='git cvsimport testing for correct patchset estimation'\n setup_cvs_test_repository t9603\n \n test_expect_failure PERL 'import with criss cross times on revisions' '\n-\n-    git cvsimport -p\"-x\" -C module-git module &&\n-    (cd module-git &&\n-        git log --pretty=format:%s > ../actual-master &&\n-        git log A~2..A --pretty=\"format:%s %ad\" -- > ../actual-A &&\n-        echo \"\" >> ../actual-master &&\n-\techo \"\" >> ../actual-A\n-    ) &&\n-    echo \"Rev 4\n+\tgit cvsimport -p\"-x\" -C module-git module &&\n+\t(\n+\t\tcd module-git &&\n+\t\tgit log --pretty=format:%s > ../actual-master &&\n+\t\tgit log A~2..A --pretty=\"format:%s %ad\" -- > ../actual-A &&\n+\t\techo \"\" >> ../actual-master &&\n+\t\techo \"\" >> ../actual-A\n+\t) &&\n+\techo \"Rev 4\n Rev 3\n Rev 2\n Rev 1\" > expect-master &&\n-    test_cmp expect-master actual-master &&\n+\ttest_cmp expect-master actual-master &&\n \n-    echo \"Rev 5 Branch A Wed Mar 11 19:09:10 2009 +0000\n+\techo \"Rev 5 Branch A Wed Mar 11 19:09:10 2009 +0000\n Rev 4 Branch A Wed Mar 11 19:03:52 2009 +0000\" > expect-A &&\n-    test_cmp expect-A actual-A\n+\ttest_cmp expect-A actual-A\n '\n \n test_done\n-- \ngitgitgadget\n"}]}