From: Jay Soffian Date: Sat, 06 Feb 2010 04:18:45 GMT Subject: Re: [RFC/PATCH] rebase: add -x option to record original commit name Message-ID: <76718491002052018s324747ecj31963b493868dbbd@mail.gmail.com> In-Reply-To: <7vtytvf4vp.fsf@alter.siamese.dyndns.org> On Fri, Feb 5, 2010 at 9:57 PM, Junio C Hamano wrote: >> Hmfph. So I know some folks don't like polluting log messages (e.g., >> the git-svn-id footer, or apparently, the cherry-pick -x message),... > > That reminds me of a slightly related topic.  I've been running git-svn to > follow (but never build) a project without metadata, exactly because I do > not want the log message contamination. I am having a hard time mapping > the commit object name back to the upstream subversion serial number. Since there is a difference of opinion here, how about this proposal: 1) We keep -x in cherry-pick 2) I convince you to add my -x patch to rebase.sh (hmm, how to do that?) :-) 3) We add a -X option to both cherry-pick and rebase.sh that records in the notes instead of in the log message. > I ended up using this hacky script for that.  It finds the svn uuid from > the metadata file, and then finds ".rev_map.$uuid" files from all over the > place to see if any of them contains a record that points at the git > commit I am interested in. > > I really wish "git svn" has a built-in way to do something like that; > perhaps I didn't look hard enough. Is git svn find-rev not what you want? (Caveat, it doesn't seem to work for me, but it's claimed description seems to be what you're asking for.) j.