{"thread":{"id":"32753","subject":"Bug: file named - on git commit","startedAt":"2013-01-28T10:38:56Z","lastAt":"2013-02-04T19:32:48Z","messageCount":10,"participants":["Rene Moser","Matthieu Moy","Duy Nguyen","Thomas Rast","Jonathan Nieder","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"208079","messageId":"51065540.1090007@renemoser.net","threadId":"32753","inReplyTo":null,"subject":"Bug: file named - on git commit","fromName":"Rene Moser","fromEmail":"mail@renemoser.net","sentAt":"2013-01-28T10:38:56Z","receivedAt":"2013-01-28T10:38:56Z","isPatch":false,"sender":{"key":"mail@renemoser.net","avatar":"https://gravatar.com/avatar/2fbac7046ab3ea02e62594662f05bf5b7612b3053d9c8aaae8873942380819e4?d=mp&s=160"},"body":"Hi\n\nFound a little issue in git version 1.7.9.5 if a file named \"-\", causing\n\"git commit\" to read from stdin.\n\n(So you must hit ctrl-d or ctrl-c to finish the commit.)\n\nEverything looks ok to me after the commit. Other users reported to be\nfixed in 1.8.1.1 but haven't it tested myself.\n\nThis does not work:\n\nmkdir tmp && cd tmp;\necho foo >./-;\ngit init; git add .;\ngit commit -m \"is this a bug?\"\n\nKind regards\n\nRené\n\n\n\n\n\n\n"},{"id":"208080","messageId":"vpqy5fd4luh.fsf@grenoble-inp.fr","threadId":"32753","inReplyTo":"51065540.1090007@renemoser.net","subject":"Re: Bug: file named - on git commit","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2013-01-28T10:56:38Z","receivedAt":"2013-01-28T10:56:38Z","isPatch":false,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Rene Moser writes:\n\n> Hi\n>\n> Found a little issue in git version 1.7.9.5 if a file named \"-\", causing\n> \"git commit\" to read from stdin.\n\nCan't reproduce with Git version 1.8.1.1.440.g1d329bd, this probably has\nbeen fixed already.\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"208081","messageId":"CACsJy8AvuaS44r+qUV59n5XFOXWYiWK_Q36=jSbRGFcVCorkKg@mail.gmail.com","threadId":"32753","inReplyTo":"51065540.1090007@renemoser.net","subject":"Re: Bug: file named - on git commit","fromName":"Duy Nguyen","fromEmail":"pclouds@gmail.com","sentAt":"2013-01-28T10:58:43Z","receivedAt":"2013-01-28T10:58:43Z","isPatch":false,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"On Mon, Jan 28, 2013 at 5:38 PM, Rene Moser wrote:\n> Hi\n>\n> Found a little issue in git version 1.7.9.5 if a file named \"-\", causing\n> \"git commit\" to read from stdin.\n>\n> (So you must hit ctrl-d or ctrl-c to finish the commit.)\n>\n> Everything looks ok to me after the commit. Other users reported to be\n> fixed in 1.8.1.1 but haven't it tested myself.\n\nYes, it's fixed in 4682d85 (diff-index.c: \"git diff\" has no need to\nread blob from the standard input - 2012-06-27) since v1.7.11.3.\n\n\n> This does not work:\n>\n> mkdir tmp && cd tmp;\n> echo foo >./-;\n> git init; git add .;\n> git commit -m \"is this a bug?\"\n>\n> Kind regards\n>\n> René\n>\n>\n>\n>\n>\n>\n\n\n\n-- \nDuy\n"},{"id":"208082","messageId":"87txq11sbk.fsf@pctrast.inf.ethz.ch","threadId":"32753","inReplyTo":"51065540.1090007@renemoser.net","subject":"Re: Bug: file named - on git commit","fromName":"Thomas Rast","fromEmail":"trast@student.ethz.ch","sentAt":"2013-01-28T11:05:03Z","receivedAt":"2013-01-28T11:05:03Z","isPatch":false,"sender":{"key":"tr@thomasrast.ch","avatar":"https://avatars.githubusercontent.com/u/153510?v=4"},"body":"Rene Moser writes:\n\n>\n> Found a little issue in git version 1.7.9.5 if a file named \"-\", causing\n> \"git commit\" to read from stdin.\n>\n> (So you must hit ctrl-d or ctrl-c to finish the commit.)\n>\n> Everything looks ok to me after the commit. Other users reported to be\n> fixed in 1.8.1.1 but haven't it tested myself.\n>\n> This does not work:\n>\n> mkdir tmp && cd tmp;\n> echo foo >./-;\n> git init; git add .;\n> git commit -m \"is this a bug?\"\n\nThis was fixed by Junio around 4682d85 (diff-index.c: \"git diff\" has no\nneed to read blob from the standard input, 2012-06-27), which is\nincluded starting with v1.7.12 and the v1.7.11.3 maint release. Please\nupgrade.\n\n-- \nThomas Rast\ntrast@{inf,student}.ethz.ch\n"},{"id":"208083","messageId":"51065EC9.5030308@renemoser.net","threadId":"32753","inReplyTo":"87txq11sbk.fsf@pctrast.inf.ethz.ch","subject":"[CLOSED FIXED] Bug: file named - on git commit","fromName":"Rene Moser","fromEmail":"mail@renemoser.net","sentAt":"2013-01-28T11:19:37Z","receivedAt":"2013-01-28T11:19:37Z","isPatch":false,"sender":{"key":"mail@renemoser.net","avatar":"https://gravatar.com/avatar/2fbac7046ab3ea02e62594662f05bf5b7612b3053d9c8aaae8873942380819e4?d=mp&s=160"},"body":"On 01/28/2013 12:05 PM, Thomas Rast wrote:\n> This was fixed by Junio around 4682d85 (diff-index.c: \"git diff\" has no\n> need to read blob from the standard input, 2012-06-27), which is\n> included starting with v1.7.12 and the v1.7.11.3 maint release. Please\n> upgrade.\n\nThanks.\n\n\n"},{"id":"208118","messageId":"20130128204140.GA7759@google.com","threadId":"32753","inReplyTo":"87txq11sbk.fsf@pctrast.inf.ethz.ch","subject":"Re: Bug: file named - on git commit","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-01-28T20:41:40Z","receivedAt":"2013-01-28T20:41:40Z","isPatch":false,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Hi,\n\nThomas Rast wrote:\n> Rene Moser writes:\n\n>> Found a little issue in git version 1.7.9.5 if a file named \"-\", causing\n>> \"git commit\" to read from stdin.\n>>\n>> (So you must hit ctrl-d or ctrl-c to finish the commit.)\n[...]\n> This was fixed by Junio around 4682d85 (diff-index.c: \"git diff\" has no\n> need to read blob from the standard input, 2012-06-27), which is\n> included starting with v1.7.12 and the v1.7.11.3 maint release. Please\n> upgrade.\n\nShould upgrade-averse folks stuck on 1.7.10.y (like Debian 7.0, which\nis currently in the release candidate stage) take this fix? Do you\nhappen to know of any other fixes such people would want?\n\nThanks,\nJonathan\n"},{"id":"208120","messageId":"7vy5fduj2u.fsf@alter.siamese.dyndns.org","threadId":"32753","inReplyTo":"20130128204140.GA7759@google.com","subject":"Re: Bug: file named - on git commit","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-01-28T20:51:53Z","receivedAt":"2013-01-28T20:51:53Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jonathan Nieder writes:\n\n> Thomas Rast wrote:\n>> Rene Moser writes:\n>\n>>> Found a little issue in git version 1.7.9.5 if a file named \"-\", causing\n>>> \"git commit\" to read from stdin.\n>>>\n>>> (So you must hit ctrl-d or ctrl-c to finish the commit.)\n> [...]\n>> This was fixed by Junio around 4682d85 (diff-index.c: \"git diff\" has no\n>> need to read blob from the standard input, 2012-06-27), which is\n>> included starting with v1.7.12 and the v1.7.11.3 maint release. Please\n>> upgrade.\n>\n> Should upgrade-averse folks stuck on 1.7.10.y (like Debian 7.0, which\n> is currently in the release candidate stage) take this fix? Do you\n> happen to know of any other fixes such people would want?\n\nFYI, the fix referred to in this thread are three-patch series that\nforked from 1.7.6.6, so it should be trivial to merge it even to\nsuch an old version.\n\nThe topic-branch workflow shines ;-)\n"},{"id":"208123","messageId":"7vobg9uimu.fsf@alter.siamese.dyndns.org","threadId":"32753","inReplyTo":"20130128204140.GA7759@google.com","subject":"Re: Bug: file named - on git commit","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-01-28T21:01:29Z","receivedAt":"2013-01-28T21:01:29Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jonathan Nieder writes:\n\n> Thomas Rast wrote:\n>> Rene Moser writes:\n>\n>>> Found a little issue in git version 1.7.9.5 if a file named \"-\", causing\n>>> \"git commit\" to read from stdin.\n>>>\n>>> (So you must hit ctrl-d or ctrl-c to finish the commit.)\n> [...]\n>> This was fixed by Junio around 4682d85 (diff-index.c: \"git diff\" has no\n>> need to read blob from the standard input, 2012-06-27), which is\n>> included starting with v1.7.12 and the v1.7.11.3 maint release. Please\n>> upgrade.\n>\n> Should upgrade-averse folks stuck on 1.7.10.y (like Debian 7.0, which\n> is currently in the release candidate stage) take this fix? Do you\n> happen to know of any other fixes such people would want?\n\nThere are files with four dotted decimal numbers in their names in\nthe Documentation/RelNotes/ directory to help distro maintainers\nlike you to figure it want.\n\nThis is a tangent, but even with a project like git that is managed\nwith a good use of topic branch workflow, we may want to have a way\nto reliably identify the tip of an ancient fix like this. People\nmay be able to bisect down to 4682d85, and in this particular case,\nI happen to know that there wasn't any side-effect breakage\nintroduced by that commit, but there needs to be an easy way (it\ncan be expensive to compute) to make sure there is no follow-up fix\nto that particular commit.\n\nI can read \"git rev-list --parents | grep -C3 $(git rev-parse 4682d85)\"\nand then figure out what the children commits of that fix are, of\ncourse, but I suspect most people will view it as primitive ;-)\n"},{"id":"208629","messageId":"7v8v742cwh.fsf@alter.siamese.dyndns.org","threadId":"32753","inReplyTo":"20130128204140.GA7759@google.com","subject":"Re: Bug: file named - on git commit","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-02-04T17:43:10Z","receivedAt":"2013-02-04T17:43:10Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jonathan Nieder writes:\n\n>> This was fixed by Junio around 4682d85 (diff-index.c: \"git diff\" has no\n>> need to read blob from the standard input, 2012-06-27), which is\n>> included starting with v1.7.12 and the v1.7.11.3 maint release. Please\n>> upgrade.\n>\n> Should upgrade-averse folks stuck on 1.7.10.y (like Debian 7.0, which\n> is currently in the release candidate stage) take this fix? Do you\n> happen to know of any other fixes such people would want?\n\nI've been wondering if we can help automating this for backporters.\n\nBecause of the way my integration branches are managed, if you run\n\n\tgit log --first-parent v1.8.0..maint-1.8.0\n\tgit log --first-parent v1.8.1..maint\n\nthe output should give us a birds-eye view (because most are merges\nof one or more patches on a topic) of the changes that are fixes,\nexcluding any feature enhancements.\n\nYou can then iterate over the single patches applied directly on top\nof maint (or maint-1.8.0) and tips of the topics merged to maint (or\nmaint-1.8.0) and see if each of them is applicable to maint-1.7.10\ncodebase. I think you can mechanically reject the ones that are on\n'maint' that merge topics that were forked from v1.8.1 as too new.\nThat hopefully culls the topics that needs manual review and\nassessment (some may be too minor to be worth backproting, for\nexample).\n\nYou should be able to do the same for\n\n git log --first-parent v1.8.1..master\n\nThere will be fixes and features mixed in the output, but if you\ncan mechanically narrow down the ones that may be relevant to your\nold maintenance track, eyeballing the rest to judge if each of them\nis worth backporting will become a manageable task.\n"},{"id":"208637","messageId":"20130204193248.GB15552@google.com","threadId":"32753","inReplyTo":"7v8v742cwh.fsf@alter.siamese.dyndns.org","subject":"Re: Bug: file named - on git commit","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-02-04T19:32:48Z","receivedAt":"2013-02-04T19:32:48Z","isPatch":false,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Junio C Hamano wrote:\n\n> (some may be too minor to be worth backproting, for\n> example).\n\nYes, this is the part I was asking for help with. Backporting is easy\nbut convincing the release team and upgrade-averse sysadmins to like\nthe result generally isn't. Occasional nominations of the form \"this\nchange is important in my workflow\" could help.\n\nContinuing to stick to fixes to very severe bugs that stand out plus a\nrandom assortment of problems people have reported can also work fine,\nthough.\n\nThanks,\nJonathan\n"}]}