From df746c5a81ebe7d7292fe4d1f672d02a5fa6efeb Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 3 Mar 2006 01:20:08 -0800 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- contrib/git-svn/git-svn.perl | 3 +++ 1 file changed, 3 insertions(+) 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 $!; } -- 2.26.2