{"thread":{"id":"43004","subject":"[PATCH] t5533: make it pass on case-sensitive filesystems","startedAt":"2016-08-04T15:04:51Z","lastAt":"2016-08-08T11:49:47Z","messageCount":5,"participants":["Johannes Schindelin","Junio C Hamano","Jeff King"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"293084","messageId":"93e1fb21d1d24c5b751e2d9d25d9220704bae5aa.1470322425.git.johannes.schindelin@gmx.de","threadId":"43004","inReplyTo":null,"subject":"[PATCH] t5533: make it pass on case-sensitive filesystems","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2016-08-04T14:54:35Z","receivedAt":"2016-08-04T15:04:51Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"The newly-added test case wants to commit a file \"c.t\" (note the lower\ncase) when a previous test case already committed a file \"C.t\". This\nconfuses Git to the point that it thinks \"c.t\" was not staged when \"git\nadd c.t\" was called.\n\nSimply make the naming of the test commits consistent with the previous\ntest cases: use upper-case, and advance in the alphabet.\n\nThis came up in local work to rebase the Windows-specific patches to the\ncurrent `next` branch. An identical fix was suggested by John Keeping.\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\nPublished-As: https://github.com/dscho/git/releases/tag/t5533-case-insensitive-v1\nFetch-It-Via: git fetch https://github.com/dscho/git t5533-case-insensitive-v1\n t/t5533-push-cas.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/t/t5533-push-cas.sh b/t/t5533-push-cas.sh\nindex 09899af..a2c9e74 100755\n--- a/t/t5533-push-cas.sh\n+++ b/t/t5533-push-cas.sh\n@@ -220,7 +220,7 @@ test_expect_success 'new branch already exists' '\n \t(\n \t\tcd src &&\n \t\tgit checkout -b branch master &&\n-\t\ttest_commit c\n+\t\ttest_commit F\n \t) &&\n \t(\n \t\tcd dst &&\n-- \n2.9.0.281.g286a8d9\n\nbase-commit: 9813b109b4ec6630220e5f3d8aff275e23cba59e\n"},{"id":"293105","messageId":"xmqqwpjw4fmj.fsf@gitster.mtv.corp.google.com","threadId":"43004","inReplyTo":"93e1fb21d1d24c5b751e2d9d25d9220704bae5aa.1470322425.git.johannes.schindelin@gmx.de","subject":"Re: [PATCH] t5533: make it pass on case-sensitive filesystems","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-08-04T17:18:28Z","receivedAt":"2016-08-04T17:18:36Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin <johannes.schindelin@gmx.de> writes:\n\n> The newly-added test case wants to commit a file \"c.t\" (note the lower\n> case) when a previous test case already committed a file \"C.t\". This\n> confuses Git to the point that it thinks \"c.t\" was not staged when \"git\n> add c.t\" was called.\n>\n> Simply make the naming of the test commits consistent with the previous\n> test cases: use upper-case, and advance in the alphabet.\n>\n> This came up in local work to rebase the Windows-specific patches to the\n> current `next` branch. An identical fix was suggested by John Keeping.\n>\n> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n> ---\n> Published-As: https://github.com/dscho/git/releases/tag/t5533-case-insensitive-v1\n> Fetch-It-Via: git fetch https://github.com/dscho/git t5533-case-insensitive-v1\n\nThanks.  It may make it easier to see to have a blank line here,\nseparating them from the diffstat.\n\n>  t/t5533-push-cas.sh | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/t/t5533-push-cas.sh b/t/t5533-push-cas.sh\n> index 09899af..a2c9e74 100755\n> --- a/t/t5533-push-cas.sh\n> +++ b/t/t5533-push-cas.sh\n> @@ -220,7 +220,7 @@ test_expect_success 'new branch already exists' '\n>  \t(\n>  \t\tcd src &&\n>  \t\tgit checkout -b branch master &&\n> -\t\ttest_commit c\n> +\t\ttest_commit F\n>  \t) &&\n>  \t(\n>  \t\tcd dst &&\n\nThanks.\n\n> -- \n> 2.9.0.281.g286a8d9\n> \n> base-commit: 9813b109b4ec6630220e5f3d8aff275e23cba59e\n\nA totally unrelated tangent.\n\nThis line turns out to be less than useful at least in this\nparticular case.\n\nThe fix is meant for jk/push-force-with-lease-creation topic, but I\nhad to find it out by the old fashioned way, i.e. running blame for\nthese lines in 'pu' to find eee98e74f9 is the culprit and then\nrunning \"git branch --with eee98e74f9\".  The only thing the line\nmade easier is I _could_ start the blame at the named commit (which\nis on 'next') instead of 'pu'.  When I took that \"base-commit\"\nseries, I was hoping that it would give us a lot more useful\ninformation.\n\n\n"},{"id":"293190","messageId":"alpine.DEB.2.20.1608051613570.5786@virtualbox","threadId":"43004","inReplyTo":"xmqqwpjw4fmj.fsf@gitster.mtv.corp.google.com","subject":"Re: [PATCH] t5533: make it pass on case-sensitive filesystems","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2016-08-05T14:19:08Z","receivedAt":"2016-08-05T14:19:22Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Thu, 4 Aug 2016, Junio C Hamano wrote:\n\n> Johannes Schindelin <johannes.schindelin@gmx.de> writes:\n> \n> > The newly-added test case wants to commit a file \"c.t\" (note the lower\n> > case) when a previous test case already committed a file \"C.t\". This\n> > confuses Git to the point that it thinks \"c.t\" was not staged when \"git\n> > add c.t\" was called.\n> >\n> > Simply make the naming of the test commits consistent with the previous\n> > test cases: use upper-case, and advance in the alphabet.\n> >\n> > This came up in local work to rebase the Windows-specific patches to the\n> > current `next` branch. An identical fix was suggested by John Keeping.\n> >\n> > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n> > ---\n> > Published-As: https://github.com/dscho/git/releases/tag/t5533-case-insensitive-v1\n> > Fetch-It-Via: git fetch https://github.com/dscho/git t5533-case-insensitive-v1\n> \n> Thanks.  It may make it easier to see to have a blank line here,\n> separating them from the diffstat.\n\nGood suggestion! I made it so:\n\n\thttps://github.com/dscho/mail-patch-series/commit/1776cb18\n\n> > base-commit: 9813b109b4ec6630220e5f3d8aff275e23cba59e\n> \n> A totally unrelated tangent.\n> \n> This line turns out to be less than useful at least in this\n> particular case.\n> \n> The fix is meant for jk/push-force-with-lease-creation topic, but I\n> had to find it out by the old fashioned way, i.e. running blame for\n> these lines in 'pu' to find eee98e74f9 is the culprit and then\n> running \"git branch --with eee98e74f9\".  The only thing the line\n> made easier is I _could_ start the blame at the named commit (which\n> is on 'next') instead of 'pu'.  When I took that \"base-commit\"\n> series, I was hoping that it would give us a lot more useful\n> information.\n\nSorry for that. The way my mail-patch-series.sh script works is that it\ntries to determine which branch between `master`, `next` or `pu` is the\nbase (and it then submits *all* commits that are on top of that branch).\n\nSo my branch was indeed based on `next` for that reason, not on\ntop of `jk/push-force-with-lease-creation`. Otherwise, I would have\nresubmitted John's patches because the script would have determined that\nmy patch is on top of `master`, not on top of `next`.\n\nWill try to think of a better way,\nDscho\n"},{"id":"293346","messageId":"20160808112147.b4ypgazlorlyy752@sigill.intra.peff.net","threadId":"43004","inReplyTo":"alpine.DEB.2.20.1608051613570.5786@virtualbox","subject":"Re: [PATCH] t5533: make it pass on case-sensitive filesystems","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2016-08-08T11:21:47Z","receivedAt":"2016-08-08T11:21:55Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Fri, Aug 05, 2016 at 04:19:08PM +0200, Johannes Schindelin wrote:\n\n> > The fix is meant for jk/push-force-with-lease-creation topic, but I\n> > had to find it out by the old fashioned way, i.e. running blame for\n> > these lines in 'pu' to find eee98e74f9 is the culprit and then\n> > running \"git branch --with eee98e74f9\".  The only thing the line\n> > made easier is I _could_ start the blame at the named commit (which\n> > is on 'next') instead of 'pu'.  When I took that \"base-commit\"\n> > series, I was hoping that it would give us a lot more useful\n> > information.\n> \n> Sorry for that. The way my mail-patch-series.sh script works is that it\n> tries to determine which branch between `master`, `next` or `pu` is the\n> base (and it then submits *all* commits that are on top of that branch).\n> \n> So my branch was indeed based on `next` for that reason, not on\n> top of `jk/push-force-with-lease-creation`. Otherwise, I would have\n> resubmitted John's patches because the script would have determined that\n> my patch is on top of `master`, not on top of `next`.\n\nDo you fetch from the main git.git repository, or Junio's gitster/git\nworkspace on GitHub?\n\nI usually fetch the latter, and then you have all the information you\nneed. So to work on somebody else's existing topic, you can do[1]:\n\n  git checkout jk/push-force-with-lease-creation\n\nwhich will check out the branch, tracking Junio's version of the topic\nas your \"upstream\". Then things like \"git rebase -i\" just work, and you\ncan extract the patches as @{u}..HEAD.\n\nIt does get weird when he picks up your patch but you want to do further\nwork, because you would probably not want to \"rebase -i\" on top of it\n(your version of the patch would become obsolete!).\n\n-Peff\n\n[1] I'm assuming you know the topic name. If not, then I usually find\n    the commit through the usual archaeology, and then run \"git branch\n    a --contains\" on it (or \"for-each-ref\" works for that these days,\n    and you can restrict it to a pattern matching topic branches).\n"},{"id":"293348","messageId":"alpine.DEB.2.20.1608081347020.5786@virtualbox","threadId":"43004","inReplyTo":"20160808112147.b4ypgazlorlyy752@sigill.intra.peff.net","subject":"Re: [PATCH] t5533: make it pass on case-sensitive filesystems","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2016-08-08T11:49:21Z","receivedAt":"2016-08-08T11:49:47Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Peff,\n\nOn Mon, 8 Aug 2016, Jeff King wrote:\n\n> On Fri, Aug 05, 2016 at 04:19:08PM +0200, Johannes Schindelin wrote:\n> \n> > > The fix is meant for jk/push-force-with-lease-creation topic, but I\n> > > had to find it out by the old fashioned way, i.e. running blame for\n> > > these lines in 'pu' to find eee98e74f9 is the culprit and then\n> > > running \"git branch --with eee98e74f9\".  The only thing the line\n> > > made easier is I _could_ start the blame at the named commit (which\n> > > is on 'next') instead of 'pu'.  When I took that \"base-commit\"\n> > > series, I was hoping that it would give us a lot more useful\n> > > information.\n> > \n> > Sorry for that. The way my mail-patch-series.sh script works is that\n> > it tries to determine which branch between `master`, `next` or `pu` is\n> > the base (and it then submits *all* commits that are on top of that\n> > branch).\n> > \n> > So my branch was indeed based on `next` for that reason, not on top of\n> > `jk/push-force-with-lease-creation`. Otherwise, I would have\n> > resubmitted John's patches because the script would have determined\n> > that my patch is on top of `master`, not on top of `next`.\n> \n> Do you fetch from the main git.git repository, or Junio's gitster/git\n> workspace on GitHub?\n\nNeither. I typically fetch from https://github.com/git/git.\n\nEven so, I can in general find out relatively easily what commit is the\ntip of the branch I am looking for.\n\nIn this here case, I was just too lazy (or too busy with other stuff,\ndepending on your point of view), is all ;-)\n\nCiao,\nDscho\n"}]}