diff options
| author |  Fabian Emmes <fabian.emmes@rwth-aachen.de> | 2009-01-02 16:40:13 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-01-03 14:15:22 -0800 |
| commit | 280514e1dff3284549175cb0e8edb9b796e8891e (patch) | |
| tree | d0f7a8af470e95fc3c88bf1f9902df7a617a8256 | |
| parent | GIT 1.6.1 (diff) | |
| download | tgif-280514e1dff3284549175cb0e8edb9b796e8891e.tar.xz | |
cvsserver: add option to configure commit message
cvsserver annotates each commit message by "via git-CVS emulator". This is
made configurable via gitcvs.commitmsgannotation.
Signed-off-by: Fabian Emmes <fabian.emmes@rwth-aachen.de>
Signed-off-by: Lars Noschinski <lars@public.noschinski.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/config.txt | 4 | ||||
| -rwxr-xr-x | git-cvsserver.perl | 8 |
2 files changed, 11 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 52786c7df5..b4e0eea9f7 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -723,6 +723,10 @@ gc.rerereunresolved:: kept for this many days when 'git-rerere gc' is run. The default is 15 days. See linkgit:git-rerere[1]. +gitcvs.commitmsgannotation:: + Append this string to each commit message. Set to empty string + to disable this feature. Defaults to "via git-CVS emulator". + gitcvs.enabled:: Whether the CVS server interface is enabled for this repository. See linkgit:git-cvsserver[1]. diff --git a/git-cvsserver.perl b/git-cvsserver.perl index b0a805c688..cbcaeb44e4 100755 --- a/git-cvsserver.perl +++ b/git-cvsserver.perl @@ -1358,7 +1358,13 @@ sub req_ci # write our commit message out if we have one ... my ( $msg_fh, $msg_filename ) = tempfile( DIR => $TEMP_DIR ); print $msg_fh $state->{opt}{m};# if ( exists ( $state->{opt}{m} ) ); - print $msg_fh "\n\nvia git-CVS emulator\n"; + if ( defined ( $cfg->{gitcvs}{commitmsgannotation} ) ) { + if ($cfg->{gitcvs}{commitmsgannotation} !~ /^\s*$/ ) { + print $msg_fh "\n\n".$cfg->{gitcvs}{commitmsgannotation}."\n" + } + } else { + print $msg_fh "\n\nvia git-CVS emulator\n"; + } close $msg_fh; my $commithash = `git-commit-tree $treehash -p $parenthash < $msg_filename`; |