Sorry for the late reply, I've been all over the place lately. Kelvie Wong <kelvie@xxxxxxxx> wrote: > Just did it again this morning, with a clean test branch: > > kelvie@mudd (text-edit) qt $ git checkout -b test git-svn > Switched to a new branch "test" > kelvie@mudd (test) qt $ touch test > kelvie@mudd (test) qt $ git add test > kelvie@mudd (test) qt $ git commit -a -m 'Test!' > Created commit 05c4016: Test! > 0 files changed, 0 insertions(+), 0 deletions(-) > create mode 100644 apps/qt/test > kelvie@mudd (test) qt $ git-cat-file commit HEAD > tree 867c0aa4c814542f0752b5d4c85fc96ba2279aac > parent 831ffbf25057ed30274d4216269c572cfce12184 > author Kelvie Wong <Kelvie.Wong@xxxxxxxx> 1196352603 -0800 > committer Kelvie Wong <Kelvie.Wong@xxxxxxxx> 1196352603 -0800 > > Test! > kelvie@mudd (test) qt $ git svn rebase > <snip> > HEAD is now at 7319c2a... (svn commit message) > kelvie@mudd (test) qt $ git-cat-file commit HEAD > tree 4edacbd41af76ac243099467b33350887c0fb03d > parent 7319c2a810554aab25a688bcc2b16fc60529b59d > author Kelvie Wong <Kelvie.Wong@xxxxxxxx> 1196352603 -0800 > committer ogibbins <ogibbins@e2d93294-a71b-0410-9dca-e2ea525a67c9> > 1196346907 +0000 > > Test! > kelvie@mudd (test) qt $ git --version > git version 1.5.3.6.736.gb7f30 > > And again, the committer of a local commit gets changed. > > Now, this part is more interesting: > > kelvie@mudd (test) qt $ git checkout working > Switched to branch "working" > kelvie@mudd (working) qt $ git svn rebase > <no fetch, just a checkout and rebase> > > And when I cat-file the commit, this time it's preserved. Wild guess > here (this behaviour seems kind of inconsistent), but it has to do > with the transition between fetch and rebase? Or is this a bug in > git-rebase somewhere? Ah, it looks like a bug in git-svn. The following should fix it:
