{"thread":{"id":"44967","subject":"[PATCH] fixup! worktree move: new command","startedAt":"2017-01-25T13:04:50Z","lastAt":"2017-01-30T12:30:58Z","messageCount":4,"participants":["Johannes Schindelin","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"310159","messageId":"4f4ae057cd4d72d5b945a856deacd921fb5e7977.1485349447.git.johannes.schindelin@gmx.de","threadId":"44967","inReplyTo":null,"subject":"[PATCH] fixup! worktree move: new command","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2017-01-25T13:04:36Z","receivedAt":"2017-01-25T13:04:50Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"This is required for the test to pass on Windows, where $TRASH_DIRECTORY\nis a POSIX path, while Git works with Windows paths instead. Using\n`$(pwd)` is the common workaround: it reports a Windows path (while `$PWD`\nwould report the POSIX equivalent which, however, would only be understood\nby shell and Perl scripts).\n\nDuy, if you re-roll the `worktree-move` patch series, would you terribly\nmind squashing this in?\n\nSigned-off-by: Johannes Schindelin \n---\nBased-On: pu at https://github.com/dscho/git\nFetch-Base-Via: git fetch https://github.com/dscho/git pu\nPublished-As: https://github.com/dscho/git/releases/tag/nd/worktree-move-fixup-v1\nFetch-It-Via: git fetch https://github.com/dscho/git nd/worktree-move-fixup-v1\n\n t/t2028-worktree-move.sh | 7 ++++---\n 1 file changed, 4 insertions(+), 3 deletions(-)\n\ndiff --git a/t/t2028-worktree-move.sh b/t/t2028-worktree-move.sh\nindex 084acc6c6d..b3105eaaed 100755\n--- a/t/t2028-worktree-move.sh\n+++ b/t/t2028-worktree-move.sh\n@@ -71,13 +71,14 @@ test_expect_success 'move locked worktree' '\n '\n \n test_expect_success 'move worktree' '\n+\ttoplevel=\"$(pwd)\" &&\n \tgit worktree move source destination &&\n \ttest_path_is_missing source &&\n \tgit worktree list --porcelain | grep \"^worktree\" >actual &&\n \tcat <<-EOF >expected &&\n-\tworktree $TRASH_DIRECTORY\n-\tworktree $TRASH_DIRECTORY/destination\n-\tworktree $TRASH_DIRECTORY/elsewhere\n+\tworktree $toplevel\n+\tworktree $toplevel/destination\n+\tworktree $toplevel/elsewhere\n \tEOF\n \ttest_cmp expected actual &&\n \tgit -C destination log --format=%s >actual2 &&\n\nbase-commit: 8ef3497bf10296c74058e87d9c5b93372cad5137\n-- \n2.11.0.windows.3.498.g86d49cc\n"},{"id":"310403","messageId":"alpine.DEB.2.20.1701271150200.3469@virtualbox","threadId":"44967","inReplyTo":"4f4ae057cd4d72d5b945a856deacd921fb5e7977.1485349447.git.johannes.schindelin@gmx.de","subject":"Re: [PATCH] fixup! worktree move: new command","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2017-01-27T10:53:04Z","receivedAt":"2017-01-27T11:00:17Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Wed, 25 Jan 2017, Johannes Schindelin wrote:\n\n> This is required for the test to pass on Windows, where $TRASH_DIRECTORY\n> is a POSIX path, while Git works with Windows paths instead. Using\n> `$(pwd)` is the common workaround: it reports a Windows path (while `$PWD`\n> would report the POSIX equivalent which, however, would only be understood\n> by shell and Perl scripts).\n> \n> Duy, if you re-roll the `worktree-move` patch series, would you terribly\n> mind squashing this in?\n> \n> Signed-off-by: Johannes Schindelin \n> ---\n\nGiven that you add all kinds of SQUASH patches in `pu` that have not even\nalways been discussed on the mailing list, I would like to kindly ask you\nto please add this patch to the nd/worktree-move branch for the time being\n(i.e. until Duy responds), so that I am not continuously pestered by\nfailing Continuous Integration builds about a problem for which I have\nprovided a fix already.\n\nThanks,\nJohannes\n"},{"id":"310421","messageId":"xmqqwpdgz8zq.fsf@gitster.mtv.corp.google.com","threadId":"44967","inReplyTo":"alpine.DEB.2.20.1701271150200.3469@virtualbox","subject":"Re: [PATCH] fixup! worktree move: new command","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-01-27T17:51:53Z","receivedAt":"2017-01-27T17:54:30Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin writes:\n\n> always been discussed on the mailing list, I would like to kindly ask you\n> to please add this patch to the nd/worktree-move branch for the time being\n> (i.e. until Duy responds),\n\nThe tip of 'pu' (or anything beyond the tip of 'jch') is not always\nexpected to pass test or even build, and unless I know the OP is\nleaky or usually slow, a \"fixup!\" that directly addresses the OP\ntends to be left for the OP to pick up [*1*] to avoid \"ah, you sent\na reroll but I already had one squashed locally\", which is confusing\nto both myself and OP (and adds burden to me).\n\nIt seems that OP is slower to respond than his usual, so I'll add it\nto the tip of the topic so that it won't be lost.\n\n\n[Footnote]\n\n*1* It still is used on my end to leave a mental note to myself that\n the topic is expected/waiting to be rerolled, but that is not\n something you can read in \"git log --first-parent master..pu\".\n"},{"id":"310521","messageId":"alpine.DEB.2.20.1701301317500.3469@virtualbox","threadId":"44967","inReplyTo":"xmqqwpdgz8zq.fsf@gitster.mtv.corp.google.com","subject":"Re: [PATCH] fixup! worktree move: new command","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2017-01-30T12:24:07Z","receivedAt":"2017-01-30T12:30:58Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Fri, 27 Jan 2017, Junio C Hamano wrote:\n\n> The tip of 'pu' (or anything beyond the tip of 'jch') is not always\n> expected to pass test or even build, [...]\n\nThis makes `pu` a lot less useful than it could be.\n\nAnd we could easily improve the situation simply by changing the rule ever\nso slightly: when a build, or a test, fails in `pu` and there exists a\nfix, this fix should go into `pu` ASAP.\n\nAs you point out later in your mail, the fixup! or SQUASH! commit is a\nvery convenient reminder that a particular branch is still \"under\nconstruction\". That is, changing the rule as I proposed above will not\nonly help the Continuous Integration [*1*] to avoid reporting duplicates,\nit will also help us improve the project faster.\n\nCiao,\nJohannes\n\nFootnote *1*: It appears that there may be the misconception floating\naround that Continuous Integration is designed to annoy developers by\npointing out unportable or unbuildable code. Once you realize, though,\nthat it detects and reports code that is below our existing code's\nquality, no doubt you will agree that it is a convenient tool to relieve\nreviewers from tedious work that can be done by a machine as well.\n"}]}