user/sven/git.git/git-cvsimport.perl, branch v1.5.4.4

cvsimport: have default merge regex also match beginning of commit message

2008-02-13T22:22:54Z

The default value of @mergerx uses \W, which matches a non-word character; this means that commit messages like "Merging FOO" are not matched by default; using \b, which matches a word boundary, instead of \W fixes that. This change was suggested by Frédéric Brière through http://bugs.debian.org/463468 Signed-off-by: Gerrit Pape Signed-off-by: Junio C Hamano

cvsimport: remove last use of repo-config from git standard tools

2008-01-14T05:48:22Z

git cvsimport was the last tool to use repo-config instead of config. Update it to use plain git config. Signed-off-by: Dan McGee Signed-off-by: Junio C Hamano

cvsimport: die on cvsps errors

2007-12-24T06:33:07Z

We were not previously checking the exit status of cvsps at all. If it exited before producing any useful output, we ended up with an empty import, which caused a spew of confusing error messages from other parts of git: $ git-cvsimport foo Initialized empty Git repository in ... some error from cvsps fatal: refs/heads/origin: not a valid SHA1 fatal: master: not a valid SHA1 warning: You appear to be on a branch yet to be born. warning: Forcing checkout of HEAD. fatal: just how do you expect me to merge 0 trees? checkout failed: 256 Now we get: $ git-cvsimport foo Initialized empty Git repository in ... some error from cvsps git-cvsimport: fatal: cvsps reported error Signed-off-by: Jeff King Acked-by: Martin Langhoff Signed-off-by: Junio C Hamano

Small comment fix for git-cvsimport.

2007-12-22T08:23:17Z

Signed-off-by: Stefan Sperling Signed-off-by: Junio C Hamano

Merge branch 'maint'

2007-12-01T00:21:33Z

* maint: Replace the word 'update-cache' by 'update-index' everywhere cvsimport: fix usage of cvsimport.module t7003-filter-branch: Fix test of a failing --msg-filter. cvsimport: miscellaneous packed-ref fixes cvsimport: use rev-parse to support packed refs Add basic cvsimport tests

cvsimport: fix usage of cvsimport.module

2007-11-30T23:00:31Z

There were two problems: 1. We only look at the config variable if there is no module given on the command line. We checked this by comparing @ARGV == 0. However, at the time of the comparison, we have not yet parsed the dashed options, meaning that "git cvsimport" would read the variable but "git cvsimport -a" would not. This is fixed by simply moving the check after the call to getopt. 2. If the config variable did not exist, we were adding an empty string to @ARGV. The rest of the script, rather than barfing for insufficient input, would then try to import the module '', leading to rather confusing error messages. Based on patch from Emanuele Giaquinta. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

cvsimport: miscellaneous packed-ref fixes

2007-11-28T22:38:35Z

These were found with a grep for '$git_dir'; they all replace a direct access of "$git_dir/refs/..." with a call to git-rev-parse or git-update-ref. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

cvsimport: use rev-parse to support packed refs

2007-11-28T22:38:06Z

Previously, if refs were packed, git-cvsimport would assume that particular refs did not exist. This could lead to, for example, overwriting previous 'origin' commits that were packed. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

git-cvsimport: fix handling of user name when it is not set in CVSROOT

2007-11-09T09:23:40Z

The cvs programs do not default to "anonymous" as the user name, but use the currently logged in user. This patch more closely matches the cvs behavior. Signed-off-by: Gordon Hopper Signed-off-by: Junio C Hamano

git-cvsimport: really convert underscores in branch names to dots with -u

2007-11-04T04:31:22Z

The documentation states for the -u option that underscores in tag and branch names are converted to dots, but this was actually implemented for the tag names only. Kurt Roeckx reported this through http://bugs.debian.org/446495 Signed-off-by: Gerrit Pape Signed-off-by: Junio C Hamano