git/apply.c, branch v2.11.2

i18n: apply: mark error message for translation

2016-10-17T21:51:42Z

Update test to reflect changes. Signed-off-by: Vasco Almeida Signed-off-by: Junio C Hamano

i18n: apply: mark error messages for translation

2016-10-14T17:53:58Z

Mark error messages for translation passed to error() and die() functions. Signed-off-by: Vasco Almeida Signed-off-by: Junio C Hamano

i18n: apply: mark info messages for translation

2016-10-14T17:53:51Z

Mark messages for translation printed to stderr. Signed-off-by: Vasco Almeida Signed-off-by: Junio C Hamano

i18n: apply: mark plural string for translation

2016-10-14T17:53:49Z

Mark plural string for translation using Q_(). Signed-off-by: Vasco Almeida Signed-off-by: Junio C Hamano

introduce CHECKOUT_INIT

2016-09-22T20:42:18Z

Add a static initializer for struct checkout and use it throughout the code base. It's shorter, avoids a memset(3) call and makes sure the base_dir member is initialized to a valid (empty) string. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

Merge branch 'bc/object-id'

2016-09-19T20:47:19Z

The "unsigned char sha1[20]" to "struct object_id" conversion continues. Notable changes in this round includes that ce->sha1, i.e. the object name recorded in the cache_entry, turns into an object_id. It had merge conflicts with a few topics in flight (Christian's "apply.c split", Dscho's "cat-file --filters" and Jeff Hostetler's "status --porcelain-v2"). Extra sets of eyes double-checking for mismerges are highly appreciated. * bc/object-id: builtin/reset: convert to use struct object_id builtin/commit-tree: convert to struct object_id builtin/am: convert to struct object_id refs: add an update_ref_oid function. sha1_name: convert get_sha1_mb to struct object_id builtin/update-index: convert file to struct object_id notes: convert init_notes to use struct object_id builtin/rm: convert to use struct object_id builtin/blame: convert file to use struct object_id Convert read_mmblob to take struct object_id. notes-merge: convert struct notes_merge_pair to struct object_id builtin/checkout: convert some static functions to struct object_id streaming: make stream_blob_to_fd take struct object_id builtin: convert textconv_object to use struct object_id builtin/cat-file: convert some static functions to struct object_id builtin/cat-file: convert struct expand_data to use struct object_id builtin/log: convert some static functions to use struct object_id builtin/blame: convert struct origin to use struct object_id builtin/apply: convert static functions to struct object_id cache: convert struct cache_entry to use struct object_id

apply: learn to use a different index file

2016-09-07T19:29:54Z

Sometimes we want to apply in a different index file. Before the apply functionality was libified it was possible to use the GIT_INDEX_FILE environment variable, for this purpose. But now, as the apply functionality has been libified, it should be possible to do that in a libified way. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

apply: pass apply state to build_fake_ancestor()

2016-09-07T19:29:54Z

To libify git apply functionality, we will need to read from a different index file in get_current_sha1(). This index file will be stored in "struct apply_state", so let's pass the state to build_fake_ancestor() which will later pass it to get_current_sha1(). Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

apply: refactor `git apply` option parsing

2016-09-07T19:29:53Z

Parsing `git apply` options can be useful to other commands that want to call the libified apply functionality, because this way they can easily pass some options from their own command line to the libified apply functionality. This will be used by `git am` in a following patch. To make this possible, let's refactor the `git apply` option parsing code into a new libified apply_parse_options() function. Doing that makes it possible to remove some functions definitions from "apply.h" and make them static in "apply.c". Helped-by: Ramsay Jones Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

apply: change error_routine when silent

2016-09-07T19:29:53Z

To avoid printing anything when applying with `state->apply_verbosity == verbosity_silent`, let's save the existing warn and error routines before applying, and let's replace them with a routine that does nothing. Then after applying, let's restore the saved routines. Note that, as we need to restore the saved routines in all cases, we cannot return early any more in apply_all_patches(). Helped-by: Stefan Beller Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano