git/git-cvsimport.perl, branch v2.16.2

cvsimport: apply shell-quoting regex globally

2017-12-08T17:02:54Z

Commit 5b4efea666 (cvsimport: shell-quote variable used in backticks, 2017-09-11) tried to shell-quote a variable, but forgot to use the "/g" modifier to apply the quoting to the whole variable. This means we'd miss any embedded single-quotes after the first one. Reported-by: Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

cvsimport: shell-quote variable used in backticks

2017-09-12T02:10:22Z

We run `git rev-parse` though the shell, and quote its argument only with single-quotes. This prevents most metacharacters from being a problem, but misses the obvious case when $name itself has single-quotes in it. We can fix this by applying the usual shell-quoting formula. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'cn/cvsimport-perl-update'

2015-06-25T18:08:08Z

* cn/cvsimport-perl-update: cvsimport: silence regex warning appearing in Perl 5.22.

cvsimport: silence regex warning appearing in Perl 5.22.

2015-06-25T00:14:27Z

Since Perl 5.22, "A literal '{' should now be escaped in a pattern". Silence the recently added warning by using \{ instead. Signed-off-by: Christian Neukirchen Signed-off-by: Junio C Hamano

merge: deprecate 'git merge HEAD ' syntax

2015-04-29T20:28:10Z

We had this in "git merge" manual for eternity: 'git merge' HEAD ... [This] syntax ( `HEAD` ...) is supported for historical reasons. Do not use it from the command line or in new scripts. It is the same as `git merge -m ...`. With the update to "git merge" to make it understand what is recorded in FETCH_HEAD directly, including Octopus merge cases, we now can rewrite the use of this syntax in "git pull" with a simple "git merge FETCH_HEAD". Also there are quite a few fallouts in the test scripts, and it turns out that "git cvsimport" also uses this old syntax to record a merge. Judging from this result, I would not be surprised if dropping the support of the old syntax broke scripts people have written and been relying on for the past ten years. But at least we can start the deprecation process by throwing a warning message when the syntax is used. With luck, we might be able to drop the support in a few years. Signed-off-by: Junio C Hamano

git-cvsimport: use a lowercase "usage:" string

2013-02-24T21:31:07Z

Make the usage string consistent with Git. Reviewed-by: Jonathan Nieder Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

cvsimport: format commit timestamp ourselves without using strftime

2013-02-09T22:41:49Z

Some implementations of strftime(3) lack support for "%z". Also there is no need for %s in git-cvsimport as the supplied time is already in seconds since the epoch. For %z, use the function get_tz_offset provided by Git.pm instead. Signed-off-by: Ben Walton Signed-off-by: Junio C Hamano

cvsimport: work around perl tzset issue

2012-11-04T13:02:41Z

On many platforms, the first invocation of localtime_r will check $TZ in the environment, but subsequent invocations will use a cached value. That means that setting $ENV{TZ} in the middle of the program may or may not have an effect on later calls to localtime. Perl 5.10.0 and later handles this automatically for us, but we try to remain portable back to 5.8. Work around it by calling tzset ourselves.

git-cvsimport: allow author-specific timezones

2012-10-17T05:23:18Z

CVS patchsets are imported with timestamps having an offset of +0000 (UTC). The cvs-authors file is already used to translate the CVS username to full name and email in the corresponding commit. Extend this file to support an optional timezone for calculating a user- specific timestamp offset. Signed-off-by: Chris Rorvick Signed-off-by: Junio C Hamano

cvsimport: strip all inappropriate tag strings

2012-09-06T17:40:09Z

Certain characters such as "?" can be present in a CVS tag name, but git does not allow these characters in tags. If git-cvsimport encounters a CVS tag that git cannot handle, cvsimport will error and refuse to continue the import beyond that point. When importing CVS tags, strip all the inappropriate strings from the tag names as we translate them to git tag names. Provide more debugging information to the user if we've altered the tag and the "git tag" command still fails. Also, warn the user if we end up skipping an (unusable) tag altogether. Signed-off-by: Ken Dreyer Signed-off-by: Junio C Hamano