From: "Avery Pennarun" <apenwarr@gmail.com>
To: "Junio C Hamano" <gitster@pobox.com>
Cc: git@vger.kernel.org, "Avery Pennarun" <apenwarr@versabanq.com>
Subject: Re: [PATCH 2/3] git-svn: Add --add-author-from option.
Date: Wed, 16 Apr 2008 12:46:08 -0400 [thread overview]
Message-ID: <32541b130804160946s343d53d2l271b9391d89a7953@mail.gmail.com> (raw)
In-Reply-To: <7vej96v2pk.fsf@gitster.siamese.dyndns.org>
On 4/16/08, Junio C Hamano <gitster@pobox.com> wrote:
> apenwarr@gmail.com writes:
> > This adds a From: line (based on the commit's author information) when
> > sending to svn. It doesn't add if a From: or Signed-off-by: header already
> > exists for that commit.
>
> I admit that I do not use git-svn, but I am confused. Where are you
> adding that "From:"? You grab a commit log message out of git (which does
> not have such "From:", add such a line at the beginning of the commit
> message using the authorship information and send the resulting commit log
> message to svn? Why?
When git-svn copies a commit from git to svn, svn eats the authorship
information; it always sets the svn author field to the username of
the person logged into the svn server.
With the (existing) --use-log-author option, git-svn will pull From:
and Signed-off-by: lines from svn's log entries when pulling back into
git, which helps with this problem. However, it only works with
commits that have a Signed-off-by: or From: already included.
The new option --add-author-from makes sure that every commit going
into svn *does* have a From: or a Signed-off-by: by adding one based
on the git Author field if it doesn't already exist. Combined with
--use-log-author, this reduces the information loss in a round trip
through the svn server. (And there's always a round trip, as "git-svn
dcommit" throws away your pre-svn commits and replaces them with the
commit it has put into, then pulled out of, svn.)
Does that make sense?
Thanks,
Avery
next prev parent reply other threads:[~2008-04-16 16:47 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-16 1:04 [PATCH 1/3] git-svn: add documentation for --use-log-author option apenwarr
2008-04-16 1:04 ` [PATCH 2/3] git-svn: Add --add-author-from option apenwarr
2008-04-16 1:04 ` [PATCH 3/3] git-svn: add documentation for " apenwarr
2008-04-16 4:33 ` [PATCH 2/3] git-svn: Add " Junio C Hamano
2008-04-16 16:46 ` Avery Pennarun [this message]
2008-04-16 18:36 ` Junio C Hamano
2008-04-16 18:45 ` Avery Pennarun
2008-04-16 19:11 ` Richard Quirk
2008-04-16 19:23 ` Dmitry Potapov
2008-04-16 22:24 ` Sam Vilain
2008-04-16 22:34 ` Avery Pennarun
2008-04-17 4:36 ` Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=32541b130804160946s343d53d2l271b9391d89a7953@mail.gmail.com \
--to=apenwarr@gmail.com \
--cc=apenwarr@versabanq.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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 NNTP newsgroup(s).