{"thread":{"id":"28335","subject":"git rebase fails with: Patch does not have a valid e-mail address.","startedAt":"2011-09-08T11:47:04Z","lastAt":"2011-09-09T04:45:14Z","messageCount":4,"participants":["James Blackburn","Junio C Hamano","Kyle Moffett"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"175088","messageId":"CACyv8dckmRxgb9_FDTW+=1Y9bS27b3XZQCHnhjpfHiJig5p6wg@mail.gmail.com","threadId":"28335","inReplyTo":null,"subject":"git rebase fails with: Patch does not have a valid e-mail address.","fromName":"James Blackburn","fromEmail":"jamesblackburn@gmail.com","sentAt":"2011-09-08T11:47:04Z","receivedAt":"2011-09-08T11:47:04Z","isPatch":false,"sender":{"key":"jamesblackburn@gmail.com","avatar":"https://gravatar.com/avatar/dacd1de956aceccae413b86cfb42fa952deb80631f85c4be6da4093e37416479?d=mp&s=160"},"body":"Hi,\n\nI'm trying to rewrite some history and git's telling me:\n\n-bash:jamesb:lc-cam-025:33079> git rebase\n7f58969b933745d4cb9bb128bbd3fa8d441cdb92\nFirst, rewinding head to replay your work on top of it...\nPatch does not have a valid e-mail address.\n\nNow it's true there isn't an email address for the author - the author\nno longer works for the company, and the email address was removed\nduring the conversion. Therefore the repo contains \"Author <>\".\n\nGiven git doesn't ordinarily complain about this, should this prevent\nrebase from working?\n\nCheers,\nJames\n"},{"id":"175122","messageId":"7v7h5jx8dz.fsf@alter.siamese.dyndns.org","threadId":"28335","inReplyTo":"CACyv8dckmRxgb9_FDTW+=1Y9bS27b3XZQCHnhjpfHiJig5p6wg@mail.gmail.com","subject":"Re: git rebase fails with: Patch does not have a valid e-mail address.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-09-08T17:15:52Z","receivedAt":"2011-09-08T17:15:52Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"James Blackburn writes:\n\n> I'm trying to rewrite some history and git's telling me:\n>\n> -bash:jamesb:lc-cam-025:33079> git rebase\n> 7f58969b933745d4cb9bb128bbd3fa8d441cdb92\n> First, rewinding head to replay your work on top of it...\n> Patch does not have a valid e-mail address.\n>\n> Now it's true there isn't an email address for the author - the author\n> no longer works for the company, and the email address was removed\n> during the conversion. Therefore the repo contains \"Author <>\".\n>\n> Given git doesn't ordinarily complain about this, should this prevent\n> rebase from working?\n\nPerhaps you used \"filter-branch\" for conversion and your \"doesn't\nordinarily complain about this\" refers to it? If so, I have to say that it\nis filter-branch that needs to be fixed to error out.\n"},{"id":"175104","messageId":"7vipp2wx13.fsf@alter.siamese.dyndns.org","threadId":"28335","inReplyTo":"CACyv8dc28sRWsObYi3vbFNakj=R-2Q9eAoJdFfqNxsqq2+_aPg@mail.gmail.com","subject":"Re: git rebase fails with: Patch does not have a valid e-mail address.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-09-08T21:21:12Z","receivedAt":"2011-09-08T21:21:12Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"James Blackburn writes:\n\n>> Perhaps you used \"filter-branch\" for conversion and your \"doesn't\n>> ordinarily complain about this\" refers to it? If so, I have to say that it\n>> is filter-branch that needs to be fixed to error out.\n>\n> I use cvs2git for the conversion (which produces a fast-import\n> stream). That tool doesn't enforce an email address, and it's only\n> when I try to rebase that I run into this problem... AFAICS there's\n> nothing fundamentally wrong with what I'm trying to do, so forcing me\n> to re-write the author seems to be the wrong answer, no?\n\nSorry, I do not follow. Nobody is forcing you to rewrite the author, but\nearlier didn't you say _you_ rewrote the author into that invalid empty\nstring yourself, no?\n"},{"id":"175148","messageId":"CAGZ=bqJc-Yqp_hDNsfpqq-DPafrh0sDKbSfgTGgR9GGHEwiuug@mail.gmail.com","threadId":"28335","inReplyTo":"CACyv8dckmRxgb9_FDTW+=1Y9bS27b3XZQCHnhjpfHiJig5p6wg@mail.gmail.com","subject":"Re: git rebase fails with: Patch does not have a valid e-mail address.","fromName":"Kyle Moffett","fromEmail":"kyle@moffetthome.net","sentAt":"2011-09-09T04:45:14Z","receivedAt":"2011-09-09T04:45:14Z","isPatch":false,"sender":{"key":"kyle@moffetthome.net","avatar":null},"body":"On Thu, Sep 8, 2011 at 07:47, James Blackburn wrote:\n> I'm trying to rewrite some history and git's telling me:\n>\n> -bash:jamesb:lc-cam-025:33079> git rebase\n> 7f58969b933745d4cb9bb128bbd3fa8d441cdb92\n> First, rewinding head to replay your work on top of it...\n> Patch does not have a valid e-mail address.\n>\n> Now it's true there isn't an email address for the author - the author\n> no longer works for the company, and the email address was removed\n> during the conversion.  Therefore the repo contains \"Author <>\".\n\nI can't really speak directly on the \"rebase\" issue, but...\n\nYou probably don't want to remove the email address from the repository\nduring a rewrite. When I was converting some old CVS repositories for\nmy company I very intentionally looked up all of our old user emails to\nbe able to convert them reliably (even though most of the addresses at\nthat point did not work). Even for the users where I could not find a\nfunctional address I would just pick something reasonable based on the\nusername convention at the time.\n\nIn cases where you can't accurately attribute the commit (IE: username\nof \"root\" or \"cvs\" or something), you probably want to rewrite it using an\ninternal mailing list address. For example, if the kernel had been in a\nCVS repository with commits by \"root\", I would probably rewrite those\nto be created by:\n Linux Kernel Developers \n\nCheers,\nKyle Moffett\n"}]}