diff options
| author |  Eric Wong <normalperson@yhbt.net> | 2006-03-03 01:20:08 -0800 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-03-03 11:27:18 -0800 |
| commit | df746c5a81ebe7d7292fe4d1f672d02a5fa6efeb (patch) | |
| tree | 3fa5083f9428e044b051a7643a6f9821b2f1d954 /contrib/git-svn/git-svn.perl | |
| parent | contrib/git-svn: several small bug fixes and changes (diff) | |
| download | tgif-df746c5a81ebe7d7292fe4d1f672d02a5fa6efeb.tar.xz | |
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>
Diffstat (limited to 'contrib/git-svn/git-svn.perl')
| -rwxr-xr-x | contrib/git-svn/git-svn.perl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/contrib/git-svn/git-svn.perl b/contrib/git-svn/git-svn.perl index 67368a502b..edae9d4dae 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 $!; } |