git/Documentation/technical/api-parse-options.txt, branch v2.7.3

Merge branch 'pt/pull-builtin'

2015-08-03T18:01:17Z

Reimplement 'git pull' in C. * pt/pull-builtin: pull: remove redirection to git-pull.sh pull --rebase: error on no merge candidate cases pull --rebase: exit early when the working directory is dirty pull: configure --rebase via branch..rebase or pull.rebase pull: teach git pull about --rebase pull: set reflog message pull: implement pulling into an unborn branch pull: fast-forward working tree if head is updated pull: check if in unresolved merge state pull: support pull.ff config pull: error on no merge candidates pull: pass git-fetch's options to git-fetch pull: pass git-merge's options to git-merge pull: pass verbosity, --progress flags to fetch and merge pull: implement fetch + merge pull: implement skeletal builtin pull argv-array: implement argv_array_pushv() parse-options-cb: implement parse_opt_passthru_argv() parse-options-cb: implement parse_opt_passthru()

parse-options: move unsigned long option parsing out of pack-objects.c

2015-06-22T22:07:21Z

The unsigned long option parsing (including 'k'/'m'/'g' suffix parsing) is more widely applicable. Add support for OPT_MAGNITUDE to parse-options.h and change pack-objects.c use this support. The error behavior on parse errors follows that of OPT_INTEGER. The name of the option that failed to parse is reported with a brief message describing the expect format for the option argument and then the full usage message for the command invoked. This differs from the previous behavior for OPT_ULONG used in pack-objects for --max-pack-size and --window-memory which used to display the value supplied in the error message and did not display the full usage message. Signed-off-by: Charles Bailey Signed-off-by: Junio C Hamano

parse-options-cb: implement parse_opt_passthru_argv()

2015-06-15T19:40:49Z

Certain git commands, such as git-pull, are simply wrappers around other git commands like git-fetch, git-merge and git-rebase. As such, these wrapper commands will typically need to "pass through" command-line options of the commands they wrap. Implement the parse_opt_passthru_argv() parse-options callback, which will reconstruct all the provided command-line options into an argv_array, such that it can be passed to another git command. This is useful for passing command-line options that can be specified multiple times. Helped-by: Stefan Beller Signed-off-by: Paul Tan Signed-off-by: Junio C Hamano

parse-options-cb: implement parse_opt_passthru()

2015-06-15T19:40:49Z

Certain git commands, such as git-pull, are simply wrappers around other git commands like git-fetch, git-merge and git-rebase. As such, these wrapper commands will typically need to "pass through" command-line options of the commands they wrap. Implement the parse_opt_passthru() parse-options callback, which will reconstruct the command-line option into an char* string, such that it can be passed to another git command. Helped-by: Johannes Schindelin Helped-by: Junio C Hamano Helped-by: Stefan Beller Signed-off-by: Paul Tan Signed-off-by: Junio C Hamano

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

Use the word 'stuck' instead of 'sticked'

2013-10-31T22:47:38Z

The past participle of 'stick' is 'stuck'. Signed-off-by: Nicolas Vigier Signed-off-by: Junio C Hamano

Merge branch 'ph/builtin-srcs-are-in-subdir-these-days'

2013-06-26T22:07:48Z

* ph/builtin-srcs-are-in-subdir-these-days: fix "builtin-*" references to be "builtin/*"

fix "builtin-" references to be "builtin/"

2013-06-18T18:05:51Z

Documentation and some comments still refer to files in builtin/ as 'builtin-*.[cho]'. Update these to show the correct location. Signed-off-by: Phil Hord Reviewed-by: Jonathan Nieder Assisted-by: Junio C Hamano Signed-off-by: Junio C Hamano

Merge branch 'jc/prune-all'

2013-05-29T21:23:04Z

We used the approxidate() parser for "--expire=" options of various commands, but it is better to treat --expire=all and --expire=now a bit more specially than using the current timestamp. Update "git gc" and "git reflog" with a new parsing function for expiry dates. * jc/prune-all: prune: introduce OPT_EXPIRY_DATE() and use it api-parse-options.txt: document "no-" for non-boolean options git-gc.txt, git-reflog.txt: document new expiry options date.c: add parse_expiry_date()

prune: introduce OPT_EXPIRY_DATE() and use it

2013-04-25T18:42:10Z

Earlier we added support for --expire=all (or --expire=now) that considers all crufts, regardless of their age, as eligible for garbage collection by turning command argument parsers that use approxidate() to use parse_expiry_date(), but "git prune" used a built-in parse-options facility OPT_DATE() and did not benefit from the new function. Signed-off-by: Junio C Hamano