{"thread":{"id":"43181","subject":"Re: [PATCH] Adjust t5510 to put remotes in config","startedAt":"2006-12-17T14:46:02Z","lastAt":"2006-12-19T08:18:09Z","messageCount":8,"participants":["Johannes Schindelin","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"297380","messageId":"Pine.LNX.4.63.0612171545390.3635@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"43181","inReplyTo":null,"subject":"[PATCH] Adjust t5510 to put remotes in config","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-12-17T14:46:02Z","receivedAt":"2006-12-17T14:46:02Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nSince .git/remotes/ is no longer created by default, t5510 failed.\nWhile at it, convert the tests to use the config way of specifying\nremotes instead of creating a file in .git/remotes/.\n\nSigned-off-by: Johannes Schindelin \n---\n t/t5510-fetch.sh | 14 +++++---------\n 1 files changed, 5 insertions(+), 9 deletions(-)\n\ndiff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh\nindex a11ab0a..6229433 100755\n--- a/t/t5510-fetch.sh\n+++ b/t/t5510-fetch.sh\n@@ -23,20 +23,16 @@ test_expect_success \"clone and setup child repos\" '\n \tgit clone . two &&\n \tcd two &&\n \tgit repo-config branch.master.remote one &&\n-\t{\n-\t\techo \"URL: ../one/.git/\"\n-\t\techo \"Pull: refs/heads/master:refs/heads/one\"\n-\t} >.git/remotes/one\n+\tgit repo-config remote.one.url ../one/.git/ &&\n+\tgit repo-config remote.one.fetch refs/heads/master:refs/heads/one &&\n \tcd .. &&\n \tgit clone . three &&\n \tcd three &&\n \tgit repo-config branch.master.remote two &&\n \tgit repo-config branch.master.merge refs/heads/one &&\n-\t{\n-\t\techo \"URL: ../two/.git/\"\n-\t\techo \"Pull: refs/heads/master:refs/heads/two\"\n-\t\techo \"Pull: refs/heads/one:refs/heads/one\"\n-\t} >.git/remotes/two\n+\tgit repo-config remote.two.url ../two/.git/ &&\n+\tgit repo-config remote.two.fetch refs/heads/master:refs/heads/two &&\n+\tgit repo-config --add remote.two.fetch refs/heads/one:refs/heads/one\n '\n \n test_expect_success \"fetch test\" '\n-- \n1.4.4.2.ga4be2-dirty\n"},{"id":"297212","messageId":"Pine.LNX.4.63.0612182325550.19693@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"43181","inReplyTo":"7v7iwox59i.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH] Adjust t5510 to put remotes in config","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-12-18T22:28:33Z","receivedAt":"2006-12-18T22:28:33Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Mon, 18 Dec 2006, Junio C Hamano wrote:\n\n> Johannes Schindelin writes:\n> \n> > Since .git/remotes/ is no longer created by default, t5510 failed.\n> \n> Does not reproduce for me.\n\nI just checked out a fresh copy of 'next'. It still fails. The culprit is \n61dde8f91672ab362f3cfd3af8d6d09d448d4ffe, which removes the line\n\n\t\tmkdir -p \"$GIT_DIR/remotes\" &&\n\nwhich is line 372 in the parent of that commit.\n\n> > While at it, convert the tests to use the config way of specifying\n> > remotes instead of creating a file in .git/remotes/.\n> \n> I think adding tests to use config is good, but I'd rather see\n> the test scripts to test not _only_ config but both.\n\nOkay. How about fixing the first hunk as proposed, and the second by \n'mkdir .git/remotes'?\n\nCiao,\nDscho\n"},{"id":"297030","messageId":"7vvek8vnb8.fsf@assigned-by-dhcp.cox.net","threadId":"43181","inReplyTo":"Pine.LNX.4.63.0612182325550.19693@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: [PATCH] Adjust t5510 to put remotes in config","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-12-18T22:42:03Z","receivedAt":"2006-12-18T22:42:03Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin writes:\n\n> Hi,\n>\n> On Mon, 18 Dec 2006, Junio C Hamano wrote:\n>\n>> Johannes Schindelin writes:\n>> \n>> > Since .git/remotes/ is no longer created by default, t5510 failed.\n>> \n>> Does not reproduce for me.\n>\n> I just checked out a fresh copy of 'next'. It still fails. The culprit is \n> 61dde8f91672ab362f3cfd3af8d6d09d448d4ffe, which removes the line\n>\n> \t\tmkdir -p \"$GIT_DIR/remotes\" &&\n>\n> which is line 372 in the parent of that commit.\n\nHmmmmm.\n\nBut git-clone runs git-init-db and we ship an empty remotes\ndirectory still as part of the templates. Why would removal of\nthat line matter?\n"},{"id":"298277","messageId":"Pine.LNX.4.63.0612182346500.19693@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"43181","inReplyTo":"7vvek8vnb8.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH] Adjust t5510 to put remotes in config","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-12-18T22:47:37Z","receivedAt":"2006-12-18T22:47:37Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Mon, 18 Dec 2006, Junio C Hamano wrote:\n\n> Johannes Schindelin writes:\n> \n> > Hi,\n> >\n> > On Mon, 18 Dec 2006, Junio C Hamano wrote:\n> >\n> >> Johannes Schindelin writes:\n> >> \n> >> > Since .git/remotes/ is no longer created by default, t5510 failed.\n> >> \n> >> Does not reproduce for me.\n> >\n> > I just checked out a fresh copy of 'next'. It still fails. The culprit is \n> > 61dde8f91672ab362f3cfd3af8d6d09d448d4ffe, which removes the line\n> >\n> > \t\tmkdir -p \"$GIT_DIR/remotes\" &&\n> >\n> > which is line 372 in the parent of that commit.\n> \n> Hmmmmm.\n> \n> But git-clone runs git-init-db and we ship an empty remotes\n> directory still as part of the templates. Why would removal of\n> that line matter?\n\nI don't install templates. Ever. I want to be sure that nothing slips in \nby mistake, and so I install hooks manually.\n\nCiao,\nDscho\n"},{"id":"294290","messageId":"Pine.LNX.4.63.0612182349070.19693@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"43181","inReplyTo":"Pine.LNX.4.63.0612182346500.19693@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: [PATCH] Adjust t5510 to put remotes in config","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-12-18T22:49:40Z","receivedAt":"2006-12-18T22:49:40Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Mon, 18 Dec 2006, Johannes Schindelin wrote:\n\n> I don't install templates. Ever. I want to be sure that nothing slips in \n> by mistake, and so I install hooks manually.\n\nSide note: prior to installing the tests would fail anyway, no?\n\nCiao,\nDscho\n"},{"id":"294300","messageId":"7vr6uwvmk8.fsf@assigned-by-dhcp.cox.net","threadId":"43181","inReplyTo":"Pine.LNX.4.63.0612182349070.19693@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: [PATCH] Adjust t5510 to put remotes in config","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-12-18T22:58:15Z","receivedAt":"2006-12-18T22:58:15Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin writes:\n\n> On Mon, 18 Dec 2006, Johannes Schindelin wrote:\n>\n>> I don't install templates. Ever. I want to be sure that nothing slips in \n>> by mistake, and so I install hooks manually.\n>\n> Side note: prior to installing the tests would fail anyway, no?\n\nThey shouldn't. At least the intent was to make the tests read\nfrom $SRCDIR/templates/blt/ as the source of templates.\n\nBut maybe you spotted a bug in t/test-lib.sh; I don't know\nwithout digging.\n\n"},{"id":"297594","messageId":"7virg8vl74.fsf@assigned-by-dhcp.cox.net","threadId":"43181","inReplyTo":"7vr6uwvmk8.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH] Adjust t5510 to put remotes in config","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-12-18T23:27:43Z","receivedAt":"2006-12-18T23:27:43Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano writes:\n\n> Johannes Schindelin writes:\n>\n>> On Mon, 18 Dec 2006, Johannes Schindelin wrote:\n>>\n>>> I don't install templates. Ever. I want to be sure that nothing slips in \n>>> by mistake, and so I install hooks manually.\n>>\n>> Side note: prior to installing the tests would fail anyway, no?\n>\n> They shouldn't. At least the intent was to make the tests read\n> from $SRCDIR/templates/blt/ as the source of templates.\n>\n> But maybe you spotted a bug in t/test-lib.sh; I don't know\n> without digging.\n\nIndeed it appears to be the case. I am thinking about applying\nthis patch to fix it.\n\n-- >8 --\nfix testsuite: make sure they use templates freshly built from the source\n\nThe initial t/trash repository for testing was created properly\nbut over time we gained many tests that create secondary test\nrepositories with init-db or clone and they were not careful\nenough.\n\nThis fixes it.\n\nSigned-off-by: Junio C Hamano \n---\ndiff --git a/t/test-lib.sh b/t/test-lib.sh\nindex ac7be76..7e91497 100755\n--- a/t/test-lib.sh\n+++ b/t/test-lib.sh\n@@ -182,6 +182,16 @@ test_create_repo () {\n \tcd \"$owd\"\n }\n \t\n+# Many tests do init-db and clone but they must be told about the freshly\n+# built templates.\n+git_init_db () {\n+\tgit init-db --template=\"$GIT_EXEC_PATH/templates/blt/\" \"$@\"\n+}\n+\n+git_clone () {\n+\tgit clone --template=\"$GIT_EXEC_PATH/templates/blt/\" \"$@\"\n+}\n+\n test_done () {\n \ttrap - exit\n \tcase \"$test_failure\" in\ndiff --git a/t/t4116-apply-reverse.sh b/t/t4116-apply-reverse.sh\nindex 74f5c2a..a79c77a 100755\n--- a/t/t4116-apply-reverse.sh\n+++ b/t/t4116-apply-reverse.sh\n@@ -50,12 +50,12 @@ test_expect_success 'setup separate repository lacking postimage' '\n \n \tgit tar-tree initial initial | tar xf - &&\n \t(\n-\t\tcd initial && git init-db && git add .\n+\t\tcd initial && git_init_db && git add .\n \t) &&\n \n \tgit tar-tree second second | tar xf - &&\n \t(\n-\t\tcd second && git init-db && git add .\n+\t\tcd second && git_init_db && git add .\n \t)\n \n '\ndiff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh\nindex de45ac4..8a8152b 100755\n--- a/t/t5300-pack-object.sh\n+++ b/t/t5300-pack-object.sh\n@@ -44,7 +44,7 @@ test_expect_success \\\n 'unpack without delta' \\\n \"GIT_OBJECT_DIRECTORY=.git2/objects &&\n export GIT_OBJECT_DIRECTORY &&\n- git-init-db &&\n+ git_init_db &&\n git-unpack-objects -n > log2.txt\n+\tgit_init_db 2>> log2.txt\n )\n \n add A1\ndiff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh\nindex a11ab0a..e2e8c89 100755\n--- a/t/t5510-fetch.sh\n+++ b/t/t5510-fetch.sh\n@@ -15,12 +15,12 @@ test_expect_success setup '\n \tgit commit -a -m original'\n \n test_expect_success \"clone and setup child repos\" '\n-\tgit clone . one &&\n+\tgit_clone . one &&\n \tcd one &&\n \techo >file updated by one &&\n \tgit commit -a -m \"updated by one\" &&\n \tcd .. &&\n-\tgit clone . two &&\n+\tgit_clone . two &&\n \tcd two &&\n \tgit repo-config branch.master.remote one &&\n \t{\n@@ -28,7 +28,7 @@ test_expect_success \"clone and setup child repos\" '\n \t\techo \"Pull: refs/heads/master:refs/heads/one\"\n \t} >.git/remotes/one\n \tcd .. &&\n-\tgit clone . three &&\n+\tgit_clone . three &&\n \tcd three &&\n \tgit repo-config branch.master.remote two &&\n \tgit repo-config branch.master.merge refs/heads/one &&\n@@ -74,7 +74,7 @@ test_expect_success 'fetch following tags' '\n \n \tmkdir four &&\n \tcd four &&\n-\tgit init-db &&\n+\tgit_init_db &&\n \n \tgit fetch .. :track &&\n \tgit show-ref --verify refs/tags/anno &&\ndiff --git a/t/t5520-pull.sh b/t/t5520-pull.sh\nindex f841574..66ef92f 100755\n--- a/t/t5520-pull.sh\n+++ b/t/t5520-pull.sh\n@@ -17,7 +17,7 @@ test_expect_success setup '\n test_expect_success 'pulling into void' '\n \tmkdir cloned &&\n \tcd cloned &&\n-\tgit init-db &&\n+\tgit_init_db &&\n \tgit pull ..\n '\n \ndiff --git a/t/t5600-clone-fail-cleanup.sh b/t/t5600-clone-fail-cleanup.sh\nindex 041be04..1913a12 100755\n--- a/t/t5600-clone-fail-cleanup.sh\n+++ b/t/t5600-clone-fail-cleanup.sh\n@@ -13,7 +13,7 @@ remove the directory before attempting a clone again.'\n \n test_expect_failure \\\n 'clone of non-existent source should fail' \\\n- 'git-clone foo bar'\n+ 'git_clone foo bar'\n \n test_expect_failure \\\n 'failed clone should not leave a directory' \\\n@@ -29,11 +29,11 @@ test_create_repo foo\n # current path not to the target dir\n test_expect_failure \\\n 'clone of non-existent (relative to $PWD) source should fail' \\\n- 'git-clone ../foo baz'\n+ 'git_clone ../foo baz'\n \n test_expect_success \\\n 'clone should work now that source exists' \\\n- 'git-clone foo bar'\n+ 'git_clone foo bar'\n \n test_expect_success \\\n 'successfull clone must leave the directory' \\\ndiff --git a/t/t5700-clone-reference.sh b/t/t5700-clone-reference.sh\nindex dd9caad..52dab2d 100755\n--- a/t/t5700-clone-reference.sh\n+++ b/t/t5700-clone-reference.sh\n@@ -17,7 +17,7 @@ git commit -m initial'\n cd \"$base_dir\"\n \n test_expect_success 'preparing second repository' \\\n-'git clone A B && cd B &&\n+'git_clone A B && cd B &&\n echo second > file2 &&\n git add file2 &&\n git commit -m addition &&\n@@ -27,7 +27,7 @@ git prune'\n cd \"$base_dir\"\n \n test_expect_success 'cloning with reference' \\\n-'git clone -l -s --reference B A C'\n+'git_clone -l -s --reference B A C'\n \n cd \"$base_dir\"\n \ndiff --git a/t/t5710-info-alternate.sh b/t/t5710-info-alternate.sh\nindex b9f6d96..3c43554 100755\n--- a/t/t5710-info-alternate.sh\n+++ b/t/t5710-info-alternate.sh\n@@ -34,7 +34,7 @@ git prune'\n cd \"$base_dir\"\n \n test_expect_success 'preparing second repository' \\\n-'git clone -l -s A B && cd B &&\n+'git_clone -l -s A B && cd B &&\n echo \"foo bar\" > file2 &&\n git add file2 &&\n git commit -m \"next commit\" file2 &&\n@@ -44,7 +44,7 @@ git prune'\n cd \"$base_dir\"\n \n test_expect_success 'preparing third repository' \\\n-'git clone -l -s B C && cd C &&\n+'git_clone -l -s B C && cd C &&\n echo \"Goodbye, cruel world\" > file3 &&\n git add file3 &&\n git commit -m \"one more\" file3 &&\n@@ -54,11 +54,11 @@ git prune'\n cd \"$base_dir\"\n \n test_expect_failure 'creating too deep nesting' \\\n-'git clone -l -s C D &&\n-git clone -l -s D E &&\n-git clone -l -s E F &&\n-git clone -l -s F G &&\n-git clone -l -s G H &&\n+'git_clone -l -s C D &&\n+git_clone -l -s D E &&\n+git_clone -l -s E F &&\n+git_clone -l -s F G &&\n+git_clone -l -s G H &&\n cd H &&\n test_valid_repo'\n \ndiff --git a/t/t7001-mv.sh b/t/t7001-mv.sh\nindex 2f4ff82..ae597e8 100755\n--- a/t/t7001-mv.sh\n+++ b/t/t7001-mv.sh\n@@ -88,7 +88,7 @@ test_expect_success \\\n \n test_expect_success \"Michael Cassar's test case\" '\n \trm -fr .git papers partA &&\n-\tgit init-db &&\n+\tgit_init_db &&\n \tmkdir -p papers/unsorted papers/all-papers partA &&\n \techo a > papers/unsorted/Thesis.pdf &&\n \techo b > partA/outline.txt &&\n@@ -109,7 +109,7 @@ rm -fr papers partA path?\n \n test_expect_success \"Sergey Vlasov's test case\" '\n \trm -fr .git &&\n-\tgit init-db &&\n+\tgit_init_db &&\n \tmkdir ab &&\n \tdate >ab.c &&\n \tdate >ab/d &&\n"},{"id":"293982","messageId":"Pine.LNX.4.63.0612190908060.19693@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"43181","inReplyTo":"7virg8vl74.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH] Adjust t5510 to put remotes in config","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-12-19T08:18:09Z","receivedAt":"2006-12-19T08:18:09Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Mon, 18 Dec 2006, Junio C Hamano wrote:\n\n> fix testsuite: make sure they use templates freshly built from the source\n\nOkay.\n\nBut why not introduce the environment variable GIT_TEMPLATE_DIR, to \nimitate similar solutions. This would result in a smaller diff, and people \nwould not have to remember typing \"git_init_db\" in tests (I admit, I did \nnot spot the subtle difference right away, and thought they were \nwhite-space fixes...).\n\nI.e. something like this instead:\n\n--\n[PATCH] Introduce GIT_TEMPLATE_DIR\n\nInstead of passing --template explicitely to init-db and clone, you can\njust set the environment variable GIT_TEMPLATE_DIR.\n\nAlso make use of it in the tests, to make sure that the templates are\ncopied.\n\nSigned-off-by: Johannes Schindelin \n\n---\n\n builtin-init-db.c | 7 +++++--\n t/test-lib.sh | 3 ++-\n 2 files changed, 7 insertions(+), 3 deletions(-)\n\ndiff --git a/builtin-init-db.c b/builtin-init-db.c\nindex fa70baa..85cd4d9 100644\n--- a/builtin-init-db.c\n+++ b/builtin-init-db.c\n@@ -124,8 +124,11 @@ static void copy_templates(const char *git_dir, int len, const char *template_di\n \tint template_len;\n \tDIR *dir;\n \n-\tif (!template_dir)\n-\t\ttemplate_dir = DEFAULT_GIT_TEMPLATE_DIR;\n+\tif (!template_dir) {\n+\t\ttemplate_dir = getenv(\"GIT_TEMPLATE_DIR\");\n+\t\tif (!template_dir)\n+\t\t\ttemplate_dir = DEFAULT_GIT_TEMPLATE_DIR;\n+\t}\n \tstrcpy(template_path, template_dir);\n \ttemplate_len = strlen(template_path);\n \tif (template_path[template_len-1] != '/') {\ndiff --git a/t/test-lib.sh b/t/test-lib.sh\nindex ac7be76..f0f9cd6 100755\n--- a/t/test-lib.sh\n+++ b/t/test-lib.sh\n@@ -208,8 +208,9 @@ test_done () {\n # t/ subdirectory and are run in trash subdirectory.\n PATH=$(pwd)/..:$PATH\n GIT_EXEC_PATH=$(pwd)/..\n+GIT_TEMPLATE_DIR=$(pwd)/../templates/blt\n HOME=$(pwd)/trash\n-export PATH GIT_EXEC_PATH HOME\n+export PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR HOME\n \n GITPERLLIB=$(pwd)/../perl/blib/lib:$(pwd)/../perl/blib/arch/auto/Git\n"}]}