git/parse-options.c, branch v1.6.3

parseopt: prevent KEEP_UNKNOWN and STOP_AT_NON_OPTION from being used together

2009-03-09T22:32:50Z

As suggested by Junio, disallow the flags PARSE_OPT_KEEP_UNKNOWN and PARSE_OPT_STOP_AT_NON_OPTION to be turned on at the same time, as a value of an unknown option could be mistakenly classified as a non-option, stopping the parser early. E.g.: git cmd --known --unknown value arg0 arg1 The parser should have stopped at "arg0", but it already stops at "value". This patch makes parse_options() die if the two flags are used in combination. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

parseopt: make usage optional

2009-03-08T20:36:41Z

Allow usagestr to be NULL and don't display any help screen in this case. This is useful to implement incremental parsers. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

parseopt: add PARSE_OPT_NO_INTERNAL_HELP

2009-03-08T20:36:27Z

Add a parseopt flag, PARSE_OPT_NO_INTERNAL_HELP, that turns off internal handling of -h, --help and --help-all. This allows the implementation of custom help option handlers or incremental parsers. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

parseopt: add PARSE_OPT_KEEP_UNKNOWN

2009-03-08T20:36:09Z

Add a parseopt flag, PARSE_OPT_KEEP_UNKNOWN, that can be used to keep unknown options in argv, similar to the existing KEEP flags. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

Make opt_parse_with_commit() non-static

2009-01-28T19:32:27Z

Moving opt_parse_with_commit() from branch to a common location, in preparation for using it in tag. Rename it to match naming convention of other option parsing functions. Signed-off-by: Jake Goulding Signed-off-by: Junio C Hamano

Teach/Fix pull/fetch -q/-v options

2008-11-15T01:18:32Z

Implement git-pull --quiet and git-pull --verbose by adding the options to git-pull and fixing verbosity handling in git-fetch. Signed-off-by: Junio C Hamano

Sync with 1.5.6.5

2008-08-06T20:50:48Z

Files given on the command line are relative to $cwd

2008-08-06T20:38:18Z

When running "git commit -F file" and "git tag -F file" from a subdirectory, we should take it as relative to the directory we started from, not relative to the top-level directory. This adds a helper function "parse_options_fix_filename()" to make it more convenient to fix this class of issues. Ideally, parse_options() should support a new type of option, "OPT_FILENAME", to do this uniformly, but this patch is meant to go to 'maint' to fix it minimally. One thing to note is that value for "commit template file" that comes from the command line is taken as relative to $cwd just like other parameters, but when it comes from the configuration varilable 'commit.template', it is taken as relative to the working tree root as before. I think this difference actually is sensible (not that I particularly think commit.template itself is sensible). Signed-off-by: Junio C Hamano

parse-options: fix segmentation fault when a required value is missing

2008-07-22T04:20:04Z

p->argc represent the number of arguments that have not been parsed yet, _including_ the one we are currently parsing. If it is not greater than one then there is no more argument. Signed-off-by: Olivier Marin Acked-by: Pierre Habouzit Signed-off-by: Junio C Hamano

parse-options.c: make check_typos() static

2008-07-16T15:50:36Z

This function is not used by any other file. Signed-off-by: Nanako Shiraishi Signed-off-by: Junio C Hamano