git/parse-options.c, branch v2.0.2

Merge branch 'mr/opt-set-ptr'

2014-04-08T19:00:17Z

OPT_SET_PTR() implementation was broken on IL32P64 platforms; it turns out that the macro is not used by any real user. * mr/opt-set-ptr: parse-options: remove unused OPT_SET_PTR parse-options: add cast to correct pointer type to OPT_SET_PTR MSVC: fix t0040-parse-options crash

parse-options: remove unused OPT_SET_PTR

2014-03-31T20:01:19Z

OPT_SET_PTR was never used since its creation at db7244bd (parse-options new features., 2007-11-07). Signed-off-by: Junio C Hamano

parse-options: make sure argh string does not have SP or _

2014-03-24T17:43:35Z

We encourage to spell an argument hint that consists of multiple words as a single-token separated with dashes. In order to help catching violations added by new callers of parse-options, make sure argh does not contain SP or _ when the code validates the option definitions. Signed-off-by: Junio C Hamano

use strchrnul() in place of strchr() and strlen()

2014-03-10T15:35:30Z

Avoid scanning strings twice, once with strchr() and then with strlen(), by using strchrnul(). Helped-by: Junio C Hamano Signed-off-by: Rohit Mani Signed-off-by: Junio C Hamano

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05T22:13:21Z

parse-options: add OPT_CMDMODE()

2013-07-30T19:23:31Z

This can be used to define a set of mutually exclusive "command mode" options, and automatically catch use of more than one from that set as an error. Signed-off-by: Junio C Hamano

Merge branch 'ef/non-ascii-parse-options-error-diag'

2013-02-15T00:06:14Z

* ef/non-ascii-parse-options-error-diag: parse-options: report uncorrupted multi-byte options

Merge branch 'jx/utf8-printf-width'

2013-02-14T18:29:08Z

Use a new helper that prints a message and counts its display width to align the help messages parse-options produces. * jx/utf8-printf-width: Add utf8_fprintf helper that returns correct number of columns

parse-options: report uncorrupted multi-byte options

2013-02-11T23:19:30Z

Because our command-line parser considers only one byte at the time for short-options, we incorrectly report only the first byte when multi-byte input was provided. This makes user-errors slightly awkward to diagnose for instance under UTF-8 locale and non-English keyboard layouts. Report the whole argument-string when a non-ASCII short-option is detected. Signed-off-by: Erik Faye-Lund Improved-by: Jeff King Signed-off-by: Junio C Hamano

Add utf8_fprintf helper that returns correct number of columns

2013-02-11T19:29:45Z

Since command usages can be translated, they may include utf-8 encoded strings, and the output in console may not align well any more. This is because strlen() is different from strwidth() on utf-8 strings. A wrapper utf8_fprintf() can help to return the correct number of columns required. Signed-off-by: Jiang Xin Signed-off-by: Nguyễn Thái Ngọc Duy Reviewed-by: Torsten Bögershausen Signed-off-by: Junio C Hamano