{"thread":{"id":"11356","subject":"Re: [PATCH 4/5] atmel_serial: Split the interrupt handler","startedAt":"2007-12-19T11:40:08Z","lastAt":"2007-12-19T22:11:55Z","messageCount":7,"participants":["Haavard Skinnemoen","Sean","Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":5},"messages":[{"id":"63749","messageId":"20071219124008.4945e592@dhcp-252-066.norway.atmel.com","threadId":"11356","inReplyTo":"alpine.LFD.0.9999.0712181318300.27475@localhost.localdomain","subject":"Re: [PATCH 4/5] atmel_serial: Split the interrupt handler","fromName":"Haavard Skinnemoen","fromEmail":"hskinnemoen@atmel.com","sentAt":"2007-12-19T11:40:08Z","receivedAt":"2007-12-19T11:40:08Z","isPatch":true,"sender":{"key":"hskinnemoen@atmel.com","avatar":null},"body":"On Tue, 18 Dec 2007 13:19:39 -0500 (EST)\nChip Coldwell wrote:\n\n> > On Tue, 18 Dec 2007 18:06:14 +0100\n> > Haavard Skinnemoen wrote:\n> > \n> > > From: Remy Bohmer \n> > \n> > Heh. That's obviously wrong. Wonder what happened there?\n> > \n> > Looks like Chip's address got mangled too. \n> \n> You can find me at or these\n> days, although still works for the time\n> being.\n\nThanks. I'll update the broken commits.\n\nBtw, the funny thing is that, looking at my shell history, I think I\nactually did the right thing when committing your patches:\n\ngit commit -s --author 'Remy Bohmer '\ngit commit -s --author 'Chip Coldwell '\n\nBut for some reason only your names stuck, not your e-mail addresses...\n\nHaavard\n"},{"id":"63766","messageId":"20071219150734.50b1f847@dhcp-252-066.norway.atmel.com","threadId":"11356","inReplyTo":"20071219124008.4945e592@dhcp-252-066.norway.atmel.com","subject":"Re: [PATCH 4/5] atmel_serial: Split the interrupt handler","fromName":"Haavard Skinnemoen","fromEmail":"hskinnemoen@atmel.com","sentAt":"2007-12-19T14:07:34Z","receivedAt":"2007-12-19T14:07:34Z","isPatch":true,"sender":{"key":"hskinnemoen@atmel.com","avatar":null},"body":"On Wed, 19 Dec 2007 12:40:08 +0100\nHaavard Skinnemoen wrote:\n\n> Btw, the funny thing is that, looking at my shell history, I think I\n> actually did the right thing when committing your patches:\n> \n> git commit -s --author 'Remy Bohmer '\n> git commit -s --author 'Chip Coldwell '\n> \n> But for some reason only your names stuck, not your e-mail addresses...\n\nIt just happened again. Seems like if git-rebase hits a conflict, and I\njust do \"git-rebase --continue\" after resolving it (and updating the\nindex), the original author's name is used, but not his e-mail address.\n\nLooks like a bug in git-rebase...?\n\nHaavard\n"},{"id":"63795","messageId":"BAYC1-PASMTP13613FE244FF93DC2BF613AE5C0@CEZ.ICE","threadId":"11356","inReplyTo":"20071219150734.50b1f847@dhcp-252-066.norway.atmel.com","subject":"Re: [PATCH 4/5] atmel_serial: Split the interrupt handler","fromName":"Sean","fromEmail":"seanlkml@sympatico.ca","sentAt":"2007-12-19T20:37:45Z","receivedAt":"2007-12-19T20:37:45Z","isPatch":true,"sender":{"key":"seanlkml@sympatico.ca","avatar":"https://gravatar.com/avatar/f92923f54fc08c401fc59b71829d4b89e9b8087fbba45ff87c82e6a83aee02ae?d=mp&s=160"},"body":"On Wed, 19 Dec 2007 15:07:34 +0100\nHaavard Skinnemoen wrote:\n\n> On Wed, 19 Dec 2007 12:40:08 +0100\n> Haavard Skinnemoen wrote:\n> \n> > Btw, the funny thing is that, looking at my shell history, I think I\n> > actually did the right thing when committing your patches:\n> > \n> > git commit -s --author 'Remy Bohmer '\n> > git commit -s --author 'Chip Coldwell '\n> > \n> > But for some reason only your names stuck, not your e-mail addresses...\n> \n> It just happened again. Seems like if git-rebase hits a conflict, and I\n> just do \"git-rebase --continue\" after resolving it (and updating the\n> index), the original author's name is used, but not his e-mail address.\n> \n> Looks like a bug in git-rebase...?\n> \n\nHi Haavard,\n\nCan't reproduce this here with the version of Git you're using (1.5.3.4).\nCan you figure out a small test case that shows the problem? Perhaps the\nproblem only shows up in your environment or with your particular config\nfile settings.\n\nRegards,\nSean\n\nP.S. Trimmed CC list.\n"},{"id":"63798","messageId":"20071219220223.7c5b3887@siona","threadId":"11356","inReplyTo":"BAYC1-PASMTP13613FE244FF93DC2BF613AE5C0@CEZ.ICE","subject":"Re: [PATCH 4/5] atmel_serial: Split the interrupt handler","fromName":"Haavard Skinnemoen","fromEmail":"hskinnemoen@atmel.com","sentAt":"2007-12-19T21:02:23Z","receivedAt":"2007-12-19T21:02:23Z","isPatch":true,"sender":{"key":"hskinnemoen@atmel.com","avatar":null},"body":"On Wed, 19 Dec 2007 15:37:45 -0500\nSean wrote:\n\n> Can't reproduce this here with the version of Git you're using\n> (1.5.3.4). Can you figure out a small test case that shows the\n> problem? Perhaps the problem only shows up in your environment or\n> with your particular config file settings.\n\nAh...seems like it only happens when I use git-rebase --interactive...\n\nTest case:\n1. Start with two branches pointing to the same commit\n2. Modify the same file on both branches in conflicting ways.\n3. Commit using a different author than the default.\n4. Use git rebase -i to rebase one of the branches on top of the other\n5. Resolve the conflict, update the index and run git rebase --continue\n\nThe last commit is now attributed to the correct name, but the default\ne-mail address (from git-config.)\n\nJust tested it with git 1.5.3.6 on a different computer.\n\n> P.S. Trimmed CC list.\n\nThanks :-)\n\nHaavard\n"},{"id":"63801","messageId":"BAYC1-PASMTP022BE21217030117EF2156AE5C0@CEZ.ICE","threadId":"11356","inReplyTo":"20071219220223.7c5b3887@siona","subject":"[PATCH] Fix interactive rebase to preserve author email address","fromName":"Sean","fromEmail":"seanlkml@sympatico.ca","sentAt":"2007-12-19T21:34:27Z","receivedAt":"2007-12-19T21:34:27Z","isPatch":true,"sender":{"key":"seanlkml@sympatico.ca","avatar":"https://gravatar.com/avatar/f92923f54fc08c401fc59b71829d4b89e9b8087fbba45ff87c82e6a83aee02ae?d=mp&s=160"},"body":"\nSigned-off-by: Sean Estabrooks \n---\n git-rebase--interactive.sh | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\n\nThis simple typo fix should hopefully make it work for you Haavard.\n\nCheers,\nSean\n\n\ndiff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh\nindex cd7e43f..7153ac7 100755\n--- a/git-rebase--interactive.sh\n+++ b/git-rebase--interactive.sh\n@@ -371,7 +371,7 @@ do\n \t\t. \"$DOTEST\"/author-script && {\n \t\t\ttest ! -f \"$DOTEST\"/amend || git reset --soft HEAD^\n \t\t} &&\n-\t\texport GIT_AUTHOR_NAME GIT_AUTHOR_NAME GIT_AUTHOR_DATE &&\n+\t\texport GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE &&\n \t\tgit commit -F \"$DOTEST\"/message -e\n \n \t\trequire_clean_work_tree\n-- \n1.5.4.rc0.73.gce85b\n"},{"id":"63802","messageId":"Pine.LNX.4.64.0712192209350.23902@racer.site","threadId":"11356","inReplyTo":"BAYC1-PASMTP022BE21217030117EF2156AE5C0@CEZ.ICE","subject":"Re: [PATCH] Fix interactive rebase to preserve author email address","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-12-19T22:11:01Z","receivedAt":"2007-12-19T22:11:01Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Wed, 19 Dec 2007, Sean wrote:\n\n> -\t\texport GIT_AUTHOR_NAME GIT_AUTHOR_NAME GIT_AUTHOR_DATE &&\n> +\t\texport GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE &&\n\nOuch. My mistake (from July 8).\n\nACK.\n\nThanks,\nDscho\n"},{"id":"63803","messageId":"20071219231155.258f8d80@siona","threadId":"11356","inReplyTo":"BAYC1-PASMTP022BE21217030117EF2156AE5C0@CEZ.ICE","subject":"Re: [PATCH] Fix interactive rebase to preserve author email address","fromName":"Haavard Skinnemoen","fromEmail":"hskinnemoen@atmel.com","sentAt":"2007-12-19T22:11:55Z","receivedAt":"2007-12-19T22:11:55Z","isPatch":true,"sender":{"key":"hskinnemoen@atmel.com","avatar":null},"body":"On Wed, 19 Dec 2007 16:34:27 -0500\nSean wrote:\n\n> This simple typo fix should hopefully make it work for you Haavard.\n\nIt does indeed. Thanks!\n\nHaavard\n"}]}