git/builtin/notes.c, branch v2.17.2

Merge branch 'nd/parseopt-completion'

2018-03-14T19:01:07Z

Teach parse-options API an option to help the completion script, and make use of the mechanism in command line completion. * nd/parseopt-completion: (45 commits) completion: more subcommands in _git_notes() completion: complete --{reuse,reedit}-message= for all notes subcmds completion: simplify _git_notes completion: don't set PARSE_OPT_NOCOMPLETE on --rerere-autoupdate completion: use __gitcomp_builtin in _git_worktree completion: use __gitcomp_builtin in _git_tag completion: use __gitcomp_builtin in _git_status completion: use __gitcomp_builtin in _git_show_branch completion: use __gitcomp_builtin in _git_rm completion: use __gitcomp_builtin in _git_revert completion: use __gitcomp_builtin in _git_reset completion: use __gitcomp_builtin in _git_replace remote: force completing --mirror= instead of --mirror completion: use __gitcomp_builtin in _git_remote completion: use __gitcomp_builtin in _git_push completion: use __gitcomp_builtin in _git_pull completion: use __gitcomp_builtin in _git_notes completion: use __gitcomp_builtin in _git_name_rev completion: use __gitcomp_builtin in _git_mv completion: use __gitcomp_builtin in _git_merge_base ...

completion: use __gitcomp_builtin in _git_notes

2018-02-09T18:24:52Z

The new completable options are: --allow-empty (notes add and notes append) --for-rewrite= (notes copy) Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

parse-options: let OPT__FORCE take optional flags argument

2018-02-09T18:24:50Z

--force option is most likely hidden from command line completion for safety reasons. This is done by adding an extra flag PARSE_OPT_NOCOMPLETE. Update OPT__FORCE() to accept additional flags. Actual flag change comes later depending on individual commands. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

sha1_file: convert write_sha1_file to object_id

2018-01-30T18:42:36Z

Convert the definition and declaration of write_sha1_file to struct object_id and adjust usage of this function. This commit also converts static function write_sha1_file_prepare, as it is closely related. Rename these functions to write_object_file and write_object_file_prepare respectively. Replace sha1_to_hex, hashcpy and hashclr with their oid equivalents wherever possible. Signed-off-by: Patryk Obara Signed-off-by: Junio C Hamano

Merge branch 'ot/pretty'

2017-12-27T19:16:29Z

Code clean-up. * ot/pretty: format: create docs for pretty.h format: create pretty.h file

format: create pretty.h file

2017-12-12T18:39:43Z

Create header for pretty.c to make formatting interface more structured. This is a middle point, this file would be merged further with other files which contain formatting stuff. Signed-off-by: Olga Telezhnaia Mentored-by: Christian Couder Mentored by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'rd/doc-notes-prune-fix'

2017-12-06T17:23:40Z

Doc update. * rd/doc-notes-prune-fix: notes: correct 'git notes prune' options to '[-n] [-v]'

Merge branch 'tz/notes-error-to-stderr' into maint

2017-12-06T17:09:04Z

"git notes" sent its error message to its standard output stream, which was corrected. * tz/notes-error-to-stderr: notes: send "Automatic notes merge failed" messages to stderr

Merge branch 'tz/notes-error-to-stderr'

2017-11-27T02:06:34Z

"git notes" sent its error message to its standard output stream, which was corrected. * tz/notes-error-to-stderr: notes: send "Automatic notes merge failed" messages to stderr

notes: correct 'git notes prune' options to '[-n] [-v]'

2017-11-22T03:59:02Z

Currently, 'git notes prune' in man page and usage message incorrectly lists options as '[-n | -v]', rather than '[-n] [-v]'. Signed-off-by: Robert P. J. Day Reviewed-by: Jonathan Nieder Signed-off-by: Junio C Hamano