* Re: [PATCH 4/5] atmel_serial: Split the interrupt handler
[not found] ` <alpine.LFD.0.9999.0712181318300.27475@localhost.localdomain>
@ 2007-12-19 11:40 ` Haavard Skinnemoen
2007-12-19 14:07 ` Haavard Skinnemoen
0 siblings, 1 reply; 7+ messages in thread
From: Haavard Skinnemoen @ 2007-12-19 11:40 UTC (permalink / raw
To: Chip Coldwell
Cc: linux, kernel, linux-kernel, Andrew Victor, Remy Bohmer,
linux-arm-kernel, git
On Tue, 18 Dec 2007 13:19:39 -0500 (EST)
Chip Coldwell <coldwell@redhat.com> wrote:
> > 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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 4/5] atmel_serial: Split the interrupt handler
2007-12-19 11:40 ` [PATCH 4/5] atmel_serial: Split the interrupt handler Haavard Skinnemoen
@ 2007-12-19 14:07 ` Haavard Skinnemoen
2007-12-19 20:37 ` Sean
0 siblings, 1 reply; 7+ messages in thread
From: Haavard Skinnemoen @ 2007-12-19 14:07 UTC (permalink / raw
To: git
Cc: Chip Coldwell, linux, kernel, linux-kernel, linux-arm-kernel,
Bohmer, Andrew Victor
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...?
Haavard
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 4/5] atmel_serial: Split the interrupt handler
2007-12-19 14:07 ` Haavard Skinnemoen
@ 2007-12-19 20:37 ` Sean
2007-12-19 21:02 ` Haavard Skinnemoen
0 siblings, 1 reply; 7+ messages in thread
From: Sean @ 2007-12-19 20:37 UTC (permalink / raw
To: Haavard Skinnemoen; +Cc: git
On Wed, 19 Dec 2007 15:07:34 +0100
Haavard Skinnemoen <hskinnemoen@atmel.com> wrote:
> 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.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 4/5] atmel_serial: Split the interrupt handler
2007-12-19 20:37 ` Sean
@ 2007-12-19 21:02 ` Haavard Skinnemoen
2007-12-19 21:34 ` [PATCH] Fix interactive rebase to preserve author email address Sean
0 siblings, 1 reply; 7+ messages in thread
From: Haavard Skinnemoen @ 2007-12-19 21:02 UTC (permalink / raw
To: Sean; +Cc: git
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] Fix interactive rebase to preserve author email address
2007-12-19 21:02 ` Haavard Skinnemoen
@ 2007-12-19 21:34 ` Sean
2007-12-19 22:11 ` Johannes Schindelin
2007-12-19 22:11 ` Haavard Skinnemoen
0 siblings, 2 replies; 7+ messages in thread
From: Sean @ 2007-12-19 21:34 UTC (permalink / raw
To: Haavard Skinnemoen; +Cc: git
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
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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] Fix interactive rebase to preserve author email address
2007-12-19 21:34 ` [PATCH] Fix interactive rebase to preserve author email address Sean
@ 2007-12-19 22:11 ` Johannes Schindelin
2007-12-19 22:11 ` Haavard Skinnemoen
1 sibling, 0 replies; 7+ messages in thread
From: Johannes Schindelin @ 2007-12-19 22:11 UTC (permalink / raw
To: Sean; +Cc: Haavard Skinnemoen, git
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Fix interactive rebase to preserve author email address
2007-12-19 21:34 ` [PATCH] Fix interactive rebase to preserve author email address Sean
2007-12-19 22:11 ` Johannes Schindelin
@ 2007-12-19 22:11 ` Haavard Skinnemoen
1 sibling, 0 replies; 7+ messages in thread
From: Haavard Skinnemoen @ 2007-12-19 22:11 UTC (permalink / raw
To: Sean; +Cc: git
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
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2007-12-19 22:12 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1197997575-13292-1-git-send-email-hskinnemoen@atmel.com>
[not found] ` <1197997575-13292-2-git-send-email-hskinnemoen@atmel.com>
[not found] ` <1197997575-13292-3-git-send-email-hskinnemoen@atmel.com>
[not found] ` <1197997575-13292-4-git-send-email-hskinnemoen@atmel.com>
[not found] ` <1197997575-13292-5-git-send-email-hskinnemoen@atmel.com>
[not found] ` <20071218181019.2af46418@dhcp-252-066.norway.atmel.com>
[not found] ` <alpine.LFD.0.9999.0712181318300.27475@localhost.localdomain>
2007-12-19 11:40 ` [PATCH 4/5] atmel_serial: Split the interrupt handler Haavard Skinnemoen
2007-12-19 14:07 ` Haavard Skinnemoen
2007-12-19 20:37 ` Sean
2007-12-19 21:02 ` Haavard Skinnemoen
2007-12-19 21:34 ` [PATCH] Fix interactive rebase to preserve author email address Sean
2007-12-19 22:11 ` Johannes Schindelin
2007-12-19 22:11 ` Haavard Skinnemoen
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).