From: Eric Wong <normalperson@yhbt.net>
Date: Fri, 3 Mar 2006 09:20:08 +0000 (-0800)
Subject: contrib/git-svn: strip 'git-svn-id:' when commiting to SVN
X-Git-Tag: v1.3.0-rc1~76
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=df746c5a81ebe7d7292fe4d1f672d02a5fa6efeb;p=git.git

contrib/git-svn: strip 'git-svn-id:' when commiting to SVN

We regenerate and use git-svn-id: whenever we fetch or otherwise
commit to remotes/git-svn.  We don't actually know what revision
number we'll commit to SVN at commit time, so this is useless.
It won't throw off things like 'rebuild', though, which knows to
only use the last instance of git-svn-id: in a log message

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/contrib/git-svn/git-svn.perl b/contrib/git-svn/git-svn.perl
index 67368a502..edae9d4da 100755
--- a/contrib/git-svn/git-svn.perl
+++ b/contrib/git-svn/git-svn.perl
@@ -625,6 +625,9 @@ sub svn_commit_tree {
 		while (<$msg_fh>) {
 			if (!$in_msg) {
 				$in_msg = 1 if (/^\s*$/);
+			} elsif (/^git-svn-id: /) {
+				# skip this, we regenerate the correct one
+				# on re-fetch anyways
 			} else {
 				print $msg $_ or croak $!;
 			}