diff options
author | Jeff King <peff@peff.net> | 2007-11-30 17:22:12 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-11-30 15:00:31 -0800 |
commit | 67d232426b8858b31e54a9b6a5a90916690d1153 (patch) | |
tree | e22c9a837118f214ede706c44c6ef3ed766dc254 /xdiff/xprepare.h | |
parent | Merge branch 'jk/maint-cvsimport-fix' into maint (diff) | |
download | tgif-67d232426b8858b31e54a9b6a5a90916690d1153.tar.xz |
cvsimport: fix usage of cvsimport.module
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 <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xprepare.h')
0 files changed, 0 insertions, 0 deletions