{"thread":{"id":"15346","subject":"[PATCH 0/4] tests: use \"git xyzzy\" form","startedAt":"2008-09-03T08:59:25Z","lastAt":"2008-09-03T21:22:05Z","messageCount":7,"participants":["Nanako Shiraishi","Andreas Ericsson","Junio C Hamano","Jeff King"],"isPatch":true,"patchVersion":1,"patchTotal":4},"messages":[{"id":"89598","messageId":"20080903175925.6117@nanako3.lavabit.com","threadId":"15346","inReplyTo":null,"subject":"[PATCH 0/4] tests: use \"git xyzzy\" form","fromName":"Nanako Shiraishi","fromEmail":"nanako3@lavabit.com","sentAt":"2008-09-03T08:59:25Z","receivedAt":"2008-09-03T08:59:25Z","isPatch":true,"sender":{"key":"nanako3@lavabit.com","avatar":"https://gravatar.com/avatar/3777b9e201c5883a62b1a6fdf7c53f2d712d1d80989146063ea861e33aad72a8?d=mp&s=160"},"body":"These four patches update test scripts to use \"git xyzzy\" format so that\nthey can serve as sample usage for git commands better.\n\n [PATCH 1/4] tests: use \"git xyzzy\" form (t0000 - t3599)\n [PATCH 2/4] tests: use \"git xyzzy\" form (t3600 - t6999)\n [PATCH 3/4] tests: use \"git xyzzy\" form (t7000 - t7199)\n [PATCH 4/4] tests: use \"git xyzzy\" form (t7200 - t9001)\n\n t/t0050-filesystem.sh | 2 +-\n t/t1007-hash-object.sh | 2 +-\n t/t1200-tutorial.sh | 2 +-\n t/t1303-wacky-config.sh | 2 +-\n t/t1400-update-ref.sh | 10 +-\n t/t1503-rev-parse-verify.sh | 2 +-\n t/t2005-checkout-index-symlinks.sh | 4 +-\n t/t2050-git-dir-relative.sh | 4 +-\n t/t2101-update-index-reupdate.sh | 2 +-\n t/t2102-update-index-symlinks.sh | 2 +-\n t/t2200-add-update.sh | 12 +-\n t/t3001-ls-files-others-exclude.sh | 2 +-\n t/t3020-ls-files-error-unmatch.sh | 2 +-\n t/t3030-merge-recursive.sh | 14 +-\n t/t3200-branch.sh | 58 +++---\n t/t3210-pack-refs.sh | 4 +-\n t/t3400-rebase.sh | 6 +-\n t/t3401-rebase-partial.sh | 22 ++--\n t/t3403-rebase-skip.sh | 2 +-\n t/t3404-rebase-interactive.sh | 2 +-\n t/t3407-rebase-abort.sh | 2 +-\n t/t3500-cherry.sh | 12 +-\n t/t3600-rm.sh | 4 +-\n t/t3800-mktag.sh | 12 +-\n t/t3900-i18n-commit.sh | 6 +-\n t/t3901-i18n-patch.sh | 16 +-\n t/t3903-stash.sh | 2 +-\n t/t4012-diff-binary.sh | 4 +-\n t/t4103-apply-binary.sh | 26 ++--\n t/t4124-apply-ws-rule.sh | 2 +-\n t/t4127-apply-same-fn.sh | 4 +-\n t/t4150-am.sh | 2 +-\n t/t4151-am-abort.sh | 4 +-\n t/t5300-pack-object.sh | 14 +-\n t/t5301-sliding-window.sh | 4 +-\n t/t5302-pack-index.sh | 12 +-\n t/t5400-send-pack.sh | 30 ++--\n t/t5401-update-hooks.sh | 4 +-\n t/t5402-post-merge-hook.sh | 4 +-\n t/t5403-post-checkout-hook.sh | 4 +-\n t/t5500-fetch-pack.sh | 4 +-\n t/t5510-fetch.sh | 2 +-\n t/t5530-upload-pack-error.sh | 4 +-\n t/t5600-clone-fail-cleanup.sh | 12 +-\n t/t5602-clone-remote-exec.sh | 4 +-\n t/t6006-rev-list-format.sh | 6 +-\n t/t6025-merge-symlinks.sh | 32 ++--\n t/t6026-merge-attr.sh | 12 +-\n t/t6030-bisect-porcelain.sh | 4 +-\n t/t6120-describe.sh | 30 ++--\n t/t6300-for-each-ref.sh | 28 ++--\n t/t7001-mv.sh | 12 +-\n t/t7003-filter-branch.sh | 22 ++--\n t/t7004-tag.sh | 318 +++++++++++++++++-----------------\n t/t7101-reset.sh | 8 +-\n t/t7102-reset.sh | 4 +-\n t/t7103-reset-bare.sh | 2 +-\n t/t7201-co.sh | 2 +-\n t/t7300-clean.sh | 72 ++++----\n t/t7400-submodule-basic.sh | 48 +++---\n t/t7401-submodule-summary.sh | 2 +-\n t/t7500-commit.sh | 2 +-\n t/t7501-commit.sh | 48 +++---\n t/t7502-status.sh | 2 +-\n t/t7505-prepare-commit-msg-hook.sh | 2 +-\n t/t7506-status-submodule.sh | 2 +-\n t/t7600-merge.sh | 2 +-\n t/t7601-merge-pull-config.sh | 2 +-\n t/t7602-merge-octopus-many.sh | 2 +-\n t/t7603-merge-reduce-heads.sh | 2 +-\n t/t7604-merge-custom-message.sh | 2 +-\n t/t7605-merge-resolve.sh | 2 +-\n t/t7610-mergetool.sh | 2 +-\n t/t7701-repack-unpack-unreachable.sh | 2 +-\n t/t9001-send-email.sh | 2 +-\n 75 files changed, 513 insertions(+), 513 deletions(-)\n\n-- \nNanako Shiraishi\nhttp://ivory.ap.teacup.com/nanako3/\n"},{"id":"89615","messageId":"48BE6D1F.1060603@op5.se","threadId":"15346","inReplyTo":"20080903175925.6117@nanako3.lavabit.com","subject":"Re: [PATCH 0/4] tests: use \"git xyzzy\" form","fromName":"Andreas Ericsson","fromEmail":"ae@op5.se","sentAt":"2008-09-03T10:55:27Z","receivedAt":"2008-09-03T10:55:27Z","isPatch":true,"sender":{"key":"ae@op5.se","avatar":"https://gravatar.com/avatar/426e89595c75a8f5252dd0c989e5fabe5bcac616e68557427ad9aef6b0ca342a?d=mp&s=160"},"body":"Nanako Shiraishi wrote:\n> These four patches update test scripts to use \"git xyzzy\" format so that\n> they can serve as sample usage for git commands better.\n> \n> [PATCH 1/4] tests: use \"git xyzzy\" form (t0000 - t3599)\n> [PATCH 2/4] tests: use \"git xyzzy\" form (t3600 - t6999)\n> [PATCH 3/4] tests: use \"git xyzzy\" form (t7000 - t7199)\n> [PATCH 4/4] tests: use \"git xyzzy\" form (t7200 - t9001)\n> \n\n\nAre you absolutely 100% certain that what you're testing is still\nthe files in the build directory after applying these patches?\n\n-- \nAndreas Ericsson andreas.ericsson@op5.se\nOP5 AB www.op5.se\nTel: +46 8-230225 Fax: +46 8-230231\n"},{"id":"89678","messageId":"7v8wu9athn.fsf@gitster.siamese.dyndns.org","threadId":"15346","inReplyTo":"48BE6D1F.1060603@op5.se","subject":"Re: [PATCH 0/4] tests: use \"git xyzzy\" form","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-09-03T20:01:56Z","receivedAt":"2008-09-03T20:01:56Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Andreas Ericsson writes:\n\n> Nanako Shiraishi wrote:\n>> These four patches update test scripts to use \"git xyzzy\" format so that\n>> they can serve as sample usage for git commands better.\n>>\n>> [PATCH 1/4] tests: use \"git xyzzy\" form (t0000 - t3599)\n>> [PATCH 2/4] tests: use \"git xyzzy\" form (t3600 - t6999)\n>> [PATCH 3/4] tests: use \"git xyzzy\" form (t7000 - t7199)\n>> [PATCH 4/4] tests: use \"git xyzzy\" form (t7200 - t9001)\n>\n> Are you absolutely 100% certain that what you're testing is still\n> the files in the build directory after applying these patches?\n\nVery good point, but that issue has been with us forever before these\npatches, because many command invocations do use \"git foo\" form already.\nt/test-lib.sh is supposed to make sure the tests do not refer to installed\ngit.\n\nMy primary development box does not have any git installed on the system\npath, and I keep a bunch of installations with prefix=$HOME/git-$variant/\nwhere $variant are master, next, maint, plus things like v1.3.0, v1.4.4.4,\netc.\n\n$PATH begins with \"/home/junio/gitstuff/bin:/home/junio/git-active/bin:\"\nbefore the usual /usr/bin:/bin and friends. \"gitstuff\" has things like\nstgit, guilt and tig but no git in it. $HOME/git-active is a symbolic\nlink to point at a specific variant installed, usually 'next' but switched\nto 'master' during the -rc cycle.\n\nI created a copy of installation from git-master in git-dontuse, replaced\nall git and git subcommands with this shell script, and pointed at it with\n$HOME/git-active:\n\n #!/bin/sh\n echo \"DO NOT USE ME\"\n echo \"DO NOT USE ME\" >&2\n exit 1\n\nThe test passes, with or without these four patches.\n"},{"id":"89683","messageId":"7vwsht9cw5.fsf@gitster.siamese.dyndns.org","threadId":"15346","inReplyTo":"7v8wu9athn.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH 0/4] tests: use \"git xyzzy\" form","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-09-03T20:45:46Z","receivedAt":"2008-09-03T20:45:46Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks.\n\nI looked at the output from:\n\n $ git grep -e git-'[a-z]' t/t[0-8]???-*.sh t/t9001-*.sh\n\nafter applying these patches to the tip of ho/dashless topic, 7e44c93\n('git foo' program identifies itself without dash in die() messages,\n2008-08-31) to review what you did not change are reasonable.\n\nI won't quote the whole output from the above grep, but there are a few\nlines worth commenting on.\n\nt/t5300-pack-object.sh:test_description='git-pack-object\nt/t5305-include-tag.sh:test_description='git-pack-object --include-tag'\n\nThese might want changing.\n\nt/t5602-clone-remote-exec.sh:\techo \"localhost git-upload-pack '\\''/path/to/repo'\\''\" >expected\nt/t5602-clone-remote-exec.sh:\tGIT_SSH=./not_ssh git clone -u /something/bin/git-upload-pack localhost:/path/to/repo junk\nt/t5602-clone-remote-exec.sh:\techo \"localhost /something/bin/git-upload-pack '\\''/path/to/repo'\\''\" >expected\n\nThese we do want to keep in git-foo form\n\nThe remainder of the grep output looked all reasonable; they hit options\nlike \"--git-dir\" and \"is-inside-git-dir\", and pathnames like \"git-gui\" and\n\".git/rebase-merge/git-rebase-todo\".\n\nDoing this _carefully_ (otherwise the result would be useless) must have\nbeen quite a lot of effort, and what was posted seems to have been done\nquite carefully.\n\nThe cross-checking I did with \"grep\" in this message does *not* catch if\nyou converted something that shouldn't have been converted (e.g. changing\nthe pathname \".git/rebase-merge/git-rebase-todo\" to \"git rebase-todo\"\nwould have been a disaster). It needs real eyeballing of the patches\nthemselves to catch such an error, and we would need help from people.\n\nVolunteers? Just please say \"I'll go through patch [n/4] line by line\"\nnow to avoid duplicated work with others (more eyeballs looking at the\nsame thing will catch more errors, but I do not think we have that many\nvolunteers here), and then after you are done, come back with \"They all\nare command invocations and conversion is correct\" or with \"This one is\nincorrect and should be kept.\"\n\nOh, also, there are many other t9XXX series of tests. Can somebody\nvolunteer to do the same for the rest of them?\n\nPuh-leeeeze?\n"},{"id":"89685","messageId":"20080903205945.GA32413@coredump.intra.peff.net","threadId":"15346","inReplyTo":"7vwsht9cw5.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH 0/4] tests: use \"git xyzzy\" form","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2008-09-03T20:59:45Z","receivedAt":"2008-09-03T20:59:45Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Sep 03, 2008 at 01:45:46PM -0700, Junio C Hamano wrote:\n\n> Doing this _carefully_ (otherwise the result would be useless) must have\n> been quite a lot of effort, and what was posted seems to have been done\n> quite carefully.\n\nYes, thank you Nanako. After complaining about it to Junio, I expected I\nwould have to be the one to do it. But procrastination pays off once\nagain...\n\n> The cross-checking I did with \"grep\" in this message does *not* catch if\n> you converted something that shouldn't have been converted (e.g. changing\n> the pathname \".git/rebase-merge/git-rebase-todo\" to \"git rebase-todo\"\n> would have been a disaster). It needs real eyeballing of the patches\n> themselves to catch such an error, and we would need help from people.\n\nWhen I did this the last time, I recall that most of the errors of that\nsort tended to make the test fail loudly. So that is a point in our\nfavor. However, I agree that eyeballing is a good strategy here.\n\nI just checked 1/4, which looks fine. Made much easier by the use of\n--color-words (even easier with -U0, but sometimes the context is\nhelpful for seeing that it is correct).\n\nIn 2/4, we change some instances of git-upload-pack, which you otherwise\nmentioned in your \"should be left\". It's in t5530 and t5602. Otherwise\nlooks fine.\n\n-Peff\n"},{"id":"89687","messageId":"20080903210920.GA3199@coredump.intra.peff.net","threadId":"15346","inReplyTo":"20080903205945.GA32413@coredump.intra.peff.net","subject":"Re: [PATCH 0/4] tests: use \"git xyzzy\" form","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2008-09-03T21:09:20Z","receivedAt":"2008-09-03T21:09:20Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Sep 03, 2008 at 04:59:45PM -0400, Jeff King wrote:\n\n> I just checked 1/4, which looks fine. Made much easier by the use of\n> --color-words (even easier with -U0, but sometimes the context is\n> helpful for seeing that it is correct).\n> \n> In 2/4, we change some instances of git-upload-pack, which you otherwise\n> mentioned in your \"should be left\". It's in t5530 and t5602. Otherwise\n> looks fine.\n\nAnd 3/4 and 4/4 look fine to me, too.\n\n-Peff\n"},{"id":"89688","messageId":"7vod359b7m.fsf@gitster.siamese.dyndns.org","threadId":"15346","inReplyTo":"20080903210920.GA3199@coredump.intra.peff.net","subject":"Re: [PATCH 0/4] tests: use \"git xyzzy\" form","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-09-03T21:22:05Z","receivedAt":"2008-09-03T21:22:05Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King writes:\n\n> On Wed, Sep 03, 2008 at 04:59:45PM -0400, Jeff King wrote:\n>\n>> I just checked 1/4, which looks fine. Made much easier by the use of\n>> --color-words (even easier with -U0, but sometimes the context is\n>> helpful for seeing that it is correct).\n>> \n>> In 2/4, we change some instances of git-upload-pack, which you otherwise\n>> mentioned in your \"should be left\". It's in t5530 and t5602. Otherwise\n>> looks fine.\n>\n> And 3/4 and 4/4 look fine to me, too.\n\nThanks, both. All four patches queued (with the tweak I mentioned to the\ntest title of t5300 and t5305 in an earlier message).\n"}]}