threads / patch / 11356

patch, 5 partsRe: [PATCH 4/5] atmel_serial: Split the interrupt handler

Subject: Re: [PATCH 4/5] atmel_serial: Split the interrupt handler

## tl;dr

7 messages between Dec 19, 2007 and Dec 19, 2007. Diffs are folded; open one to read it.

replies: 6people: 3as markdown or json

Haavard Skinnemoen· Dec 19, 2007, 11:40 UTC · lore

On Tue, 18 Dec 2007 13:19:39 -0500 (EST) Chip Coldwell <coldwell@redhat.com> wrote:

Show 12 quoted lines
> > On Tue, 18 Dec 2007 18:06:14 +0100
> > Haavard Skinnemoen <hskinnemoen@atmel.com> wrote:
> >   
> > > From: Remy Bohmer <hskinnemoen@atmel.com>  
> > 
> > Heh. That's obviously wrong. Wonder what happened there?
> > 
> > Looks like Chip's address got mangled too.  
> 
> You can find me at <coldwell@gmail.com> or <coldwell@redhat.com> these
> days, although <coldwell@frank.harvard.edu> still works for the time
> being.
Thanks. I'll update the broken commits.

Btw, the funny thing is that, looking at my shell history, I think I actually did the right thing when committing your patches:

git commit -s --author 'Remy Bohmer <linux@bohmer.net>' git commit -s --author 'Chip Coldwell <coldwell@frank.harvard.edu>'

But for some reason only your names stuck, not your e-mail addresses...
Haavard
Haavard Skinnemoen· Dec 19, 2007, 14:07 UTC · re: Haavard Skinnemoen · lore

On Wed, 19 Dec 2007 12:40:08 +0100 Haavard Skinnemoen <hskinnemoen@atmel.com> wrote:

Show 7 quoted lines
> Btw, the funny thing is that, looking at my shell history, I think I
> actually did the right thing when committing your patches:
> 
> git commit -s --author 'Remy Bohmer <linux@bohmer.net>'
> git commit -s --author 'Chip Coldwell <coldwell@frank.harvard.edu>'
> 
> But for some reason only your names stuck, not your e-mail addresses...

It just happened again. Seems like if git-rebase hits a conflict, and I just do "git-rebase --continue" after resolving it (and updating the index), the original author's name is used, but not his e-mail address.

Looks like a bug in git-rebase...?
Haavard
Sean· Dec 19, 2007, 20:37 UTC · re: Haavard Skinnemoen · lore

On Wed, 19 Dec 2007 15:07:34 +0100 Haavard Skinnemoen <hskinnemoen@atmel.com> wrote:

Show 17 quoted lines
> On Wed, 19 Dec 2007 12:40:08 +0100
> Haavard Skinnemoen <hskinnemoen@atmel.com> wrote:
> 
> > Btw, the funny thing is that, looking at my shell history, I think I
> > actually did the right thing when committing your patches:
> > 
> > git commit -s --author 'Remy Bohmer <linux@bohmer.net>'
> > git commit -s --author 'Chip Coldwell <coldwell@frank.harvard.edu>'
> > 
> > But for some reason only your names stuck, not your e-mail addresses...
> 
> It just happened again. Seems like if git-rebase hits a conflict, and I
> just do "git-rebase --continue" after resolving it (and updating the
> index), the original author's name is used, but not his e-mail address.
> 
> Looks like a bug in git-rebase...?
> 
Hi Haavard,

Can't reproduce this here with the version of Git you're using (1.5.3.4). Can you figure out a small test case that shows the problem? Perhaps the problem only shows up in your environment or with your particular config file settings.

Regards, Sean

P.S. Trimmed CC list.
Haavard Skinnemoen· Dec 19, 2007, 21:02 UTC · re: Sean · lore

On Wed, 19 Dec 2007 15:37:45 -0500 Sean <seanlkml@sympatico.ca> wrote:

> Can't reproduce this here with the version of Git you're using
> (1.5.3.4). Can you figure out a small test case that shows the
> problem?  Perhaps the problem only shows up in your environment or
> with your particular config file settings.
Ah...seems like it only happens when I use git-rebase --interactive...
Test case:
1. Start with two branches pointing to the same commit
2. Modify the same file on both branches in conflicting ways.
3. Commit using a different author than the default.
4. Use git rebase -i to rebase one of the branches on top of the other
5. Resolve the conflict, update the index and run git rebase --continue

The last commit is now attributed to the correct name, but the default e-mail address (from git-config.)

Just tested it with git 1.5.3.6 on a different computer.
> P.S. Trimmed CC list.
Thanks :-)
Haavard
Sean· Dec 19, 2007, 21:34 UTC · re: Haavard Skinnemoen · lore

[PATCH] Fix interactive rebase to preserve author email address

Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
---
 git-rebase--interactive.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
This simple typo fix should hopefully make it work for you Haavard.

Cheers, Sean

Show changes to git-rebase--interactive.sh +1 −1
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index cd7e43f..7153ac7 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -371,7 +371,7 @@ do
 		. "$DOTEST"/author-script && {
 			test ! -f "$DOTEST"/amend || git reset --soft HEAD^
 		} &&
-		export GIT_AUTHOR_NAME GIT_AUTHOR_NAME GIT_AUTHOR_DATE &&
+		export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE &&
 		git commit -F "$DOTEST"/message -e
 
 		require_clean_work_tree

-- 
1.5.4.rc0.73.gce85b
Johannes Schindelin· Dec 19, 2007, 22:11 UTC · re: Sean · lore

Re: [PATCH] Fix interactive rebase to preserve author email address

Hi,
On Wed, 19 Dec 2007, Sean wrote:
> -		export GIT_AUTHOR_NAME GIT_AUTHOR_NAME GIT_AUTHOR_DATE &&
> +		export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE &&
Ouch.  My mistake (from July 8).
ACK.

Thanks, Dscho

Haavard Skinnemoen· Dec 19, 2007, 22:11 UTC · re: Sean · lore

Re: [PATCH] Fix interactive rebase to preserve author email address

On Wed, 19 Dec 2007 16:34:27 -0500 Sean <seanlkml@sympatico.ca> wrote:

> This simple typo fix should hopefully make it work for you Haavard.
It does indeed. Thanks!
Haavard

← back to recent threads