{"thread":{"id":"2841","subject":"RE: new file leaked onto release branch","startedAt":"2005-12-14T22:06:54Z","lastAt":"2005-12-14T22:16:13Z","messageCount":2,"participants":["Brown, Len","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"13638","messageId":"F7DC2337C7631D4386A2DF6E8FB22B30056B86DD@hdsmsx401.amr.corp.intel.com","threadId":"2841","inReplyTo":null,"subject":"RE: new file leaked onto release branch","fromName":"Brown, Len","fromEmail":"len.brown@intel.com","sentAt":"2005-12-14T22:06:54Z","receivedAt":"2005-12-14T22:06:54Z","isPatch":false,"sender":{"key":"len.brown@intel.com","avatar":"https://gravatar.com/avatar/a091f34f66caadb51d85a8a496800c6ccae73737e2f45762373e6b8c55fa5dd6?d=mp&s=160"},"body":" \n>I pointed out one anomaly which is the commit should never have\n>been created because it was not even a fast forward but already\n>up-to-date case, and it was followed up with exchange of a few\n>messages between Linus and you.  But even if we got that mixed\n>up, the resulting merge should not have contained the file\n>neither parents had.  That part worries me the most.\n>\n>One question.  You mentioned these in your message, you have\n>a \"git.commit wrapper\" that contains these lines:\n>\n>    git-update-index --add --remove `quilt files`\n>    git commit\n>\n>I am not familiar with 'quilt', but is \"quilt files\" the command\n>to show the list of files with patches applied to the working\n>tree?\n\nyes, but only by the last applied \"on the top of the stack.\"\nWhen I do a commit, there is only 1 patch applied so this works okay.\n(then I push the next patch after the commit and repeat...)\n\n>If so, the above do tell git about the modified (including added\n>or removed) files that the applied quilt patches touch, which\n>sounds like the correct thing to do.\n>\n>But the resulting commit from that procedure would not be a\n>merge commit, and the commit in question that had the rsinfo\n>file magically appeared from nowhere is a merge, so this does\n>not seem to have much to do with the current problem...\n>\n>Still puzzlled, sorry.\n\nI'm not stuck by this problem, since I created a new release\nbranch based before the funny merge and it seems to be\nworking properly.  I'm sorry I can't re-create the problem\nagain.  Next time something like this happens and I notice it\nI'll be sure to keep the ingredients for the failure on hand.\n\nthanks,\n-Len\n"},{"id":"13639","messageId":"7vwti7wcia.fsf@assigned-by-dhcp.cox.net","threadId":"2841","inReplyTo":"F7DC2337C7631D4386A2DF6E8FB22B30056B86DD@hdsmsx401.amr.corp.intel.com","subject":"Re: new file leaked onto release branch","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-12-14T22:16:13Z","receivedAt":"2005-12-14T22:16:13Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Brown, Len\" <len.brown@intel.com> writes:\n\n> I'm not stuck by this problem, since I created a new release\n> branch based before the funny merge and it seems to be\n> working properly.  I'm sorry I can't re-create the problem\n> again.  Next time something like this happens and I notice it\n> I'll be sure to keep the ingredients for the failure on hand.\n\nThanks.\n\nBTW, are 5165, 3410, 5452, 5571... topic branch names?\n"}]}