Git versionup

[eos/hostdependX86LINUX64.git] / util / X86LINUX64 / libexec / git-core / git-cvsimport

diff --git a/util/X86LINUX64/libexec/git-core/git-cvsimport b/util/X86LINUX64/libexec/git-core/git-cvsimport
index 11fadab..653677e 100755 (executable)
--- a/util/X86LINUX64/libexec/git-core/git-cvsimport
+++ b/util/X86LINUX64/libexec/git-core/git-cvsimport
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-use lib (split(/:/, $ENV{GITPERLLIB} || "/home/people/tacyas/Eos/util/X86LINUX64/share/perl5"));
+use lib (split(/:/, $ENV{GITPERLLIB} || "/home/eos/Eos/util/X86LINUX64/share/perl5"));
 
 # This tool is copyright (c) 2005, Matthias Urlichs.
 # It is released under the Gnu Public License, version 2.
@@ -922,7 +922,7 @@ sub commit {
                # (See check_refname_component in refs.c.)
                1 while $xtag =~ s/
                        (?: \.\.        # Tag cannot contain '..'.
-                       |   \@{         # Tag cannot contain '@{'.
+                       |   \@\{        # Tag cannot contain '@{'.
                        | ^ -           # Tag cannot begin with '-'.
                        |   \.lock $    # Tag cannot end with '.lock'.
                        | ^ \.          # Tag cannot begin...
@@ -1163,7 +1163,7 @@ if ($orig_branch) {
                die "Fast-forward update failed: $?\n" if $?;
        }
        else {
-               system(qw(git merge cvsimport HEAD), "$remote/$opt_o");
+               system(qw(git merge -m cvsimport), "$remote/$opt_o");
                die "Could not merge $opt_o into the current branch.\n" if $?;
        }
 } else {