[PATCH v9 10/41] builtin/apply: move init_apply_state() to apply.c

To libify `git apply` functionality we must make init_apply_state() usable outside "builtin/apply.c". Let's do that by moving it into a new "apply.c". Helped-by: Eric Sunshine <sunsh...@sunshineco.com> Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> ---

[PATCH v9 39/41] apply: change error_routine when silent

To avoid printing anything when applying with `state->apply_verbosity == verbosity_silent`, let's save the existing warn and error routines before applying and replace them with a routine that does nothing. Then after applying, let's restore the saved routines. Signed-off-by: Christian Cou

[PATCH v9 38/41] usage: add get_error_routine() and get_warn_routine()

Let's make it possible to get the current error_routine and warn_routine, so that we can store them before using set_error_routine() or set_warn_routine() to use new ones. This way we will be able put back the original routines, when we are done with using new ones. Signed-off-by: Christian

[PATCH v9 17/41] builtin/apply: make gitdiff_*() return -1 on error

m> Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 40 +--- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 877610c..6a0818b 100644 --- a/builtin/apply.c +++ b/builtin/appl

[PATCH v9 28/41] builtin/apply: rename option parsing functions

As these functions are going to be part of the libified apply api, let's give them a name that is more specific to the apply api. Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 40 1 file changed, 20 insertions(

[PATCH v9 26/41] builtin/apply: make try_create_file() return -1 on error

returns -1 to signal a recoverable error. To fix that, let's make it return 1 in case of a recoverable error and -1 in case of an unrecoverable error. Helped-by: Eric Sunshine <sunsh...@sunshineco.com> Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> ---

[PATCH v9 19/41] builtin/apply: make build_fake_ancestor() return -1 on error

ine <sunsh...@sunshineco.com> Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 41 ++--- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 55f6e48..6087195 100644 --- a/builtin

Re: [ANNOUNCE] git-series: track changes to a patch series over time

On Fri, Jul 29, 2016 at 12:10 PM, Richard Ipsum wrote: > On Thu, Jul 28, 2016 at 11:40:55PM -0700, Josh Triplett wrote: > [snip] >> >> I'd welcome any feedback, whether on the interface and workflow, the >> internals and collaboration, ideas on presenting diffs of

Re: git bisect for reachable commits only

On Mon, Aug 1, 2016 at 12:02 PM, Oleg Taranenko wrote: > Guys, > > further investigation shows, git bisect is broken from its core... really. > Let consider 3rd a bit more complicated scenario > > #cd .. > #rm -rf bisect3 > mkdir bisect3 > cd bisect3 > git init > git

Re: [RFC/PATCH 0/8] Add configuration options for split-index

On Mon, Jul 25, 2016 at 6:04 PM, Duy Nguyen wrote: > > Hmm.. can you do the counting separately? A shared cache_entry must > have its field "index" greater than zero. By counting the number of > entries whose index is zero (i.e. not shared) against the total number > of real

Re: [PATCH v9 33/41] environment: add set_index_file()

On Mon, Aug 1, 2016 at 10:40 PM, Junio C Hamano wrote: > Junio C Hamano writes: > >> Stefan Beller writes: >> >>> In cache.h we have a NO_THE_INDEX_COMPATIBILITY_MACROS, >>> and lots of >>> #define foo_bar(..) frob_bar(_index, (..))

Re: [PATCH v9 33/41] environment: add set_index_file()

On Mon, Aug 1, 2016 at 7:24 PM, Stefan Beller <sbel...@google.com> wrote: > On Sat, Jul 30, 2016 at 10:25 AM, Christian Couder > <christian.cou...@gmail.com> wrote: > > I have reviewed briefly all 41 patches and generally they look good to me. > There were some nits, wh

Re: [PATCH v11 28/40] builtin/apply: rename option parsing functions

On Thu, Aug 11, 2016 at 10:58 AM, <stefan.na...@atlas-elektronik.com> wrote: > Am 11.08.2016 um 10:52 schrieb Christian Couder: >> As these functions are going to be part of the libified >> apply api, let's give them a name that is more specific > > s/api/

Re: [PATCH v10 33/40] environment: add set_index_file()

On Wed, Aug 10, 2016 at 7:34 PM, Junio C Hamano <gits...@pobox.com> wrote: > Christian Couder <christian.cou...@gmail.com> writes: > >>> Isn't the mention on NO_THE_INDEX_COMPATIBILITY_MACROS in the added >>> comments (there are two) pure red-herring? >&

[PATCH v12 07/13] apply: don't print on stdout in verbosity_silent mode

values and calls printing functions, - summary_patch_list() calls show_file_mode_name(), printf(), show_rename_copy(), show_mode_change() that are only printing. Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- apply.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

[PATCH v12 04/13] apply: make some parsing functions static again

Some parsing functions that were used in both "apply.c" and "builtin/apply.c" are now only used in the former, so they can be made static to "apply.c". Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- apply.c | 6 +++--- apply.h | 5 -

[PATCH v12 05/13] apply: use error_errno() where possible

To avoid possible mistakes and to uniformly show the errno related messages, let's use error_errno() where possible. Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- apply.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/apply.c b/a

[PATCH v12 11/13] apply: refactor `git apply` option parsing

es.plus.com> Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- apply.c | 103 +--- apply.h | 18 +++--- builtin/apply.c | 74 ++-- 3 files changed, 97 insertions(+), 98 dele

[PATCH v12 12/13] apply: learn to use a different index file

-off-by: Christian Couder <chrisc...@tuxfamily.org> --- apply.c | 10 -- apply.h | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/apply.c b/apply.c index 2ec2a8a..7e561a4 100644 --- a/apply.c +++ b/apply.c @@ -4674,8 +4674,14 @@ static int apply_patch(struct apply

[PATCH v12 06/13] apply: make it possible to silently apply

of in this patch, as that will be done in following patches. Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- apply.c | 62 + apply.h | 8 +++- builtin/apply.c | 2 +- 3 files changed, 48 insertions(

[PATCH v12 00/13] libify apply and use lib in am, part 3

server with split-index and GIT_TRACE_PERFORMANCE=1. With Git v2.8.0, the rebase took 6.375888383 s, with the git am command launched by the rebase command taking 3.705677431 s. With this series on top of next, the rebase took 3.044529494 s, with the git am command launched by the rebase c

[PATCH v12 01/13] builtin/apply: rename option parsing functions

As these functions are going to be part of the libified apply API, let's give them a name that is more specific to the apply API. Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 40 1 file changed, 20 insertions(

[PATCH v12 13/13] builtin/am: use apply API in run_apply()

ot; with split index: 1m22.476s This series on top of "next" without split index: 1m12.034s This series on top of "next" with split index: 0m15.678s (using branch "next" from mid April 2016.) Benchmarked-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com>

[PATCH v12 10/13] apply: change error_routine when silent

ler <sbel...@google.com> Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- apply.c | 21 - apply.h | 8 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/apply.c b/apply.c index ddbb0a2..bf81b70 100644 --- a/apply.c +++ b/apply.c @@

[PATCH v12 08/13] usage: add set_warn_routine()

There are already set_die_routine() and set_error_routine(), so let's add set_warn_routine() as this will be needed in a following commit. Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- git-compat-util.h | 1 + usage.c | 5 + 2 files changed, 6 insertions(+)

[PATCH v12 02/13] apply: rename and move opt constants to apply.h

The constants for the "inaccurate-eof" and the "recount" options will be used in both "apply.c" and "builtin/apply.c", so they need to go into "apply.h", and therefore they need a name that is more specific to the API they belong to. Signed

[PATCH v12 09/13] usage: add get_error_routine() and get_warn_routine()

Let's make it possible to get the current error_routine and warn_routine, so that we can store them before using set_error_routine() or set_warn_routine() to use new ones. This way we will be able put back the original routines, when we are done with using new ones. Signed-off-by: Christian

Re: [PATCH] pass constants as first argument to st_mult()

On Wed, Aug 3, 2016 at 9:13 PM, Jeff King wrote: > On Mon, Aug 01, 2016 at 03:31:45PM -0700, Junio C Hamano wrote: > >> Jeff King writes: >> >> >> *1* I have a slight suspicion that this is cultural, i.e. how >> >> arithmetic is taught in grade schools. When an

Draft of Git Rev News edition 18

Hi, A draft of a new Git Rev News edition is available here: https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-18.md Everyone is welcome to contribute in any section either by editing the above page on GitHub and sending a pull request, or by commenting on this GitHub

Re: git cherry-pick conflict error message is deceptive when cherry-picking multiple commits

Hi Stephen, On Wed, Aug 10, 2016 at 9:21 PM, Stephen Morton wrote: > > Formatting on previous email was terrible, plus the diff wasn't performed > against origin. Re-sending. Thanks for working on this... > (Finally getting back to this.) > > Something like the diff

Re: Draft of Git Rev News edition 18

On Mon, Aug 15, 2016 at 1:10 AM, Eric Wong <e...@80x24.org> wrote: > Philip Oakley <philipoak...@iee.org> wrote: >> From: "Christian Couder" <christian.cou...@gmail.com> >> >You can also reply to this email. >> >> I see you ment

Re: Draft of Git Rev News edition 18

On Sun, Aug 14, 2016 at 10:58 PM, Junio C Hamano <gits...@pobox.com> wrote: > Christian Couder <christian.cou...@gmail.com> writes: > >> You can also reply to this email. > > I am not sure that is to be recommended, as that ends up going to > the list, but anyway

Re: [PATCH v12 13/13] bisect--helper: `bisect_start` shell function partially in C

On Wed, Aug 10, 2016 at 11:57 PM, Pranit Bauva wrote: > > @@ -431,6 +434,244 @@ static int bisect_terms(struct bisect_terms *terms, > const char **argv, int argc) > return 0; > } > > +static int bisect_start(struct bisect_terms *terms, int no_checkout, > +

Re: [PATCH v10 33/40] environment: add set_index_file()

On Tue, Aug 9, 2016 at 12:13 AM, Junio C Hamano <gits...@pobox.com> wrote: > Christian Couder <christian.cou...@gmail.com> writes: > >> Now if someone really needs to use this new function, it should be >> used like this: >> >> /* Save c

[PATCH v11 28/40] builtin/apply: rename option parsing functions

As these functions are going to be part of the libified apply api, let's give them a name that is more specific to the apply API. Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 40 1 file changed, 20 insertions(

[PATCH v11 01/40] apply: make some names more specific

To prepare for some structs and constants being moved from builtin/apply.c to apply.h, we should give them some more specific names to avoid possible name collisions in the global namespace. Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- I am sending only 01/40 and 28/40 f

Re: [PATCH v10 01/40] apply: make some names more specific

On Tue, Aug 9, 2016 at 4:51 PM, <stefan.na...@atlas-elektronik.com> wrote: > Am 08.08.2016 um 23:02 schrieb Christian Couder: >> To prepare for some structs and constants being moved from >> builtin/apply.c to apply.h, we should give them some more >> specific n

Re: [RFC/PATCH 8/8] read-cache: unlink old sharedindex files

On Wed, Jul 13, 2016 at 5:16 PM, Duy Nguyen <pclo...@gmail.com> wrote: > On Tue, Jul 12, 2016 at 9:45 PM, Christian Couder > <christian.cou...@gmail.com> wrote: >> On Tue, Jul 12, 2016 at 5:12 PM, Duy Nguyen <pclo...@gmail.com> wrote: >>> >>>

Re: [PATCH 0/9] Resend of gitster/pb/bisect

Hi Pranit, On Wed, Jul 13, 2016 at 12:35 AM, Pranit Bauva wrote: > Hey Junio, > > A small mistake got unnoticed by me which Lars recently pointed out. > The naming convention is "git_path_" and underscore > instead of spaces. It's a good thing to resend when you find

Re: [ANNOUNCE] GitRev News edition 17

On Wed, Jul 20, 2016 at 10:40 PM, Junio C Hamano <gits...@pobox.com> wrote: > On Wed, Jul 20, 2016 at 1:38 PM, Christian Couder > <christian.cou...@gmail.com> wrote: >>> Micronit. 2.9.1 (or 2.9.2) would not be a "major release". 2.9.0 was, >>&g

Re: [ANNOUNCE] GitRev News edition 17

On Wed, Jul 20, 2016 at 8:05 PM, Junio C Hamano <gits...@pobox.com> wrote: > On Wed, Jul 20, 2016 at 5:58 AM, Christian Couder > <christian.cou...@gmail.com> wrote: >> Hi everyone, >> >> I'm happy announce that the 17th edition of Git Rev News is now published:

[ANNOUNCE] GitRev News edition 17

Hi everyone, I'm happy announce that the 17th edition of Git Rev News is now published: https://git.github.io/rev_news/2016/07/20/edition-17/ Thanks a lot to all the contributors and helpers, especially Jakub and Dscho! Enjoy, Christian, Thomas and Nicola. -- To unsubscribe from this list:

Re: [RFC/PATCH 8/8] read-cache: unlink old sharedindex files

On Tue, Jul 12, 2016 at 5:12 PM, Duy Nguyen wrote: > > No. People could create an index file anywhere in theory. So you don't > know how many index files there are. Maybe when an index file is created, its path and its sharedindex file could be appended into a log file. We

Draft of Git Rev News edition 17

Hi, A draft of a new Git Rev News edition is available here: https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-17.md Everyone is welcome to contribute in any section either by editing the above page on GitHub and sending a pull request, or by commenting on this GitHub

Plugin mechanism(s) for Git?

Hi, It seems to me that there are many current topics/patch series in flight that are about making Git interact with external code/processes and that it could be interesting to step back a bit and see if we could find a common approach/mechanism for at least some of these current topics. (This

Re: [RFC] Native access to Git LFS cache

On Tue, Jun 28, 2016 at 3:22 PM, Lars Schneider wrote: > > @Christian/Peff: > Is there a place to look for more info about your remote-object-store idea? You may want to take a look at: https://github.com/chriscool/git/commits/external-odb I just updated it and I may

[RFC/PATCH v2 05/10] t0400: add test for 'put' command

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- t/t0400-external-odb.sh | 9 + 1 file changed, 9 insertions(+) diff --git a/t/t0400-external-odb.sh b/t/t0400-external-odb.sh index 0f1bb97..6c6da5c 100755 --- a/t/t0400-external-odb.sh +++ b/t/t0400-external-odb.sh @@

[RFC/PATCH v2 04/10] t0400: add 'put' command to odb-helper script

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- t/t0400-external-odb.sh | 14 ++ 1 file changed, 14 insertions(+) diff --git a/t/t0400-external-odb.sh b/t/t0400-external-odb.sh index fe85413..0f1bb97 100755 --- a/t/t0400-external-odb.sh +++ b/t/t0400-external-

[RFC/PATCH v2 10/10] Add t0410 to test external ODB transfer

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- t/t0410-transfer-e-odb.sh | 136 ++ 1 file changed, 136 insertions(+) create mode 100755 t/t0410-transfer-e-odb.sh diff --git a/t/t0410-transfer-e-odb.sh b/t/t0410-transfer-e-odb.

[RFC/PATCH v2 06/10] external odb: add write support

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- external-odb.c | 15 +++ external-odb.h | 2 ++ odb-helper.c | 41 + odb-helper.h | 3 +++ sha1_file.c| 2 ++ 5 files changed, 59 insertions(+), 4 deletions(-) diff

[RFC/PATCH v2 09/10] Add GIT_NO_EXTERNAL_ODB env variable

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- cache.h| 9 + environment.c | 4 external-odb.c | 6 ++ sha1_file.c| 3 +++ 4 files changed, 22 insertions(+) diff --git a/cache.h b/cache.h index cc0a934..b0fe2bc 100644 --- a/cache.h +++ b/c

[RFC/PATCH v2 03/10] t0400: use --batch-all-objects to get all objects

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- t/t0400-external-odb.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/t/t0400-external-odb.sh b/t/t0400-external-odb.sh index 2b01617..fe85413 100755 --- a/t/t0400-external-odb.sh +++ b/t/t0400-external-

[RFC/PATCH v2 00/10] Add initial experimental external ODB support

/288151/focus=295160 Version 1 of this RFC/PATCH series is here: http://thread.gmane.org/gmane.comp.version-control.git/297164 Links ~ This patch series is available here: https://github.com/chriscool/git/commits/external-odb Version 1 is here: https://github.com/chriscool/git/commits/gl-exter

[RFC/PATCH v2 01/10] Add initial external odb support

From: Jeff King <p...@peff.net> Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- Makefile| 2 + cache.h | 9 ++ external-odb.c | 115 +++ external-odb.h | 8 ++ odb-helper.c

[RFC/PATCH v2 02/10] external odb foreach

From: Jeff King --- external-odb.c | 14 ++ external-odb.h | 6 ++ odb-helper.c | 15 +++ odb-helper.h | 4 4 files changed, 39 insertions(+) diff --git a/external-odb.c b/external-odb.c index 1ccfa99..42978a3 100644 --- a/external-odb.c

[RFC/PATCH v2 07/10] external-odb: accept only blobs for now

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- external-odb.c | 4 1 file changed, 4 insertions(+) diff --git a/external-odb.c b/external-odb.c index bb70fe3..6dd7b25 100644 --- a/external-odb.c +++ b/external-odb.c @@ -133,6 +133,10 @@ int external_odb_write_object

[RFC/PATCH v2 08/10] t0400: add test for external odb write support

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- t/t0400-external-odb.sh | 8 1 file changed, 8 insertions(+) diff --git a/t/t0400-external-odb.sh b/t/t0400-external-odb.sh index 6c6da5c..3c868ca 100755 --- a/t/t0400-external-odb.sh +++ b/t/t0400-external-odb.sh @@

[RFC/PATCH 3/8] read-cache: add and then use tweak_split_index()

This will make us use the split-index feature or not depending on the value of the core.splitIndex config variable. Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- read-cache.c | 17 + 1 file changed, 17 insertions(+) diff --git a/read-cache.c b/read-cache.c

[RFC/PATCH 8/8] read-cache: unlink old sharedindex files

Everytime split index is turned on, it creates a "sharedindex." file in the git directory. This makes sure that old sharedindex files are removed after a new one has been created. Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- read-cache.

[RFC/PATCH 7/8] t1700: add tests for core.splitIndex

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- t/t1700-split-index.sh | 37 + 1 file changed, 37 insertions(+) diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh index 8aef49f..f1af0d5 100755 --- a/t/t1700-split-index.sh +++ b/t

[RFC/PATCH 6/8] Documentation/git-update-index: talk about core.splitIndex config var

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- Documentation/git-update-index.txt | 6 ++ 1 file changed, 6 insertions(+) diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt index c6cbed1..2293140 100644 --- a/Documentation/git-

[RFC/PATCH 5/8] Documentation/config: add information for core.splitIndex

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- Documentation/config.txt | 4 1 file changed, 4 insertions(+) diff --git a/Documentation/config.txt b/Documentation/config.txt index e208af1..aec8ecb 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@

[RFC/PATCH 4/8] update-index: warn in case of split-index incoherency

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/update-index.c | 13 +++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/builtin/update-index.c b/builtin/update-index.c index f06fe80..2b8aaa6 100644 --- a/builtin/update-index.c +++ b/builtin/

[RFC/PATCH 1/8] config: add git_config_get_split_index()

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- cache.h | 1 + config.c | 10 ++ 2 files changed, 11 insertions(+) diff --git a/cache.h b/cache.h index f1dc289..5296a50 100644 --- a/cache.h +++ b/cache.h @@ -1695,6 +1695,7 @@ extern int git_config_get_bool_or_int

[RFC/PATCH 2/8] split-index: add {add,remove}_split_index() functions

Also use the functions in cmd_update_index() in builtin/update-index.c. Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/update-index.c | 17 - split-index.c | 18 ++ split-index.h | 2 ++ 3 files changed, 24 inse

[RFC/PATCH 0/8] Add configuration options for split-index

l.git/298344/ This patch series is also available here: https://github.com/chriscool/git/commits/config-split-index Christian Couder (8): config: add git_config_get_split_index() split-index: add {add,remove}_split_index() functions read-cache: add and then use tweak_split_index() update-index:

Re: [PATCH 3/7] trace: use warning() for printing trace errors

On Thu, Aug 4, 2016 at 11:28 PM, Junio C Hamano wrote: > Jeff King writes: > >> I wondered if that would then let us drop set_warn_routine(), but it >> looks like there are other warning() calls it cares about. So that would >> invalidate the last paragraph

[PATCH v10 12/40] builtin/apply: make check_apply_state() return -1 instead of die()ing

To libify `git apply` functionality we have to signal errors to the caller instead of die()ing. To do that in a compatible manner with the rest of the error handling in "builtin/apply.c", check_apply_state() should return -1 instead of calling die(). Signed-off-by: Christian Coud

[PATCH v10 22/40] builtin/apply: make add_index_file() return -1 on error

To libify `git apply` functionality we have to signal errors to the caller instead of die()ing. To do that in a compatible manner with the rest of the error handling in "builtin/apply.c", add_index_file() should return -1 instead of calling die(). Signed-off-by: Christian Coud

Re: [PATCH v10 00/40] libify apply and use lib in am, part 2

On Mon, Aug 8, 2016 at 11:02 PM, Christian Couder <christian.cou...@gmail.com> wrote: > > I will send a diff between this version and the previous one, as a > reply to this email. Here is the diff: diff --git a/apply.c b/apply.c index a73889e..2ec2a8a 100644 --- a/apply.

[PATCH v10 27/40] builtin/apply: make create_one_file() return -1 on error

To libify `git apply` functionality we have to signal errors to the caller instead of exit()ing. To do that in a compatible manner with the rest of the error handling in "builtin/apply.c", create_one_file() should return -1 instead of calling exit(). Signed-off-by: Christian Coud

[PATCH v10 32/40] apply: use error_errno() where possible

To avoid possible mistakes and to uniformly show the errno related messages, let's use error_errno() where possible. Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- apply.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/apply.c b/a

[PATCH v10 29/40] apply: rename and move opt constants to apply.h

The constants for the "inaccurate-eof" and the "recount" options will be used in both "apply.c" and "builtin/apply.c", so they need to go into "apply.h", and therefore they need a name that is more specific to the API they belong to. Signed

[PATCH v10 37/40] usage: add get_error_routine() and get_warn_routine()

Let's make it possible to get the current error_routine and warn_routine, so that we can store them before using set_error_routine() or set_warn_routine() to use new ones. This way we will be able put back the original routines, when we are done with using new ones. Signed-off-by: Christian

[PATCH v10 20/40] builtin/apply: make remove_file() return -1 on error

To libify `git apply` functionality we have to signal errors to the caller instead of die()ing. To do that in a compatible manner with the rest of the error handling in "builtin/apply.c", remove_file() should return -1 instead of calling die(). Signed-off-by: Christian Coud

[PATCH v10 34/40] apply: make it possible to silently apply

of in this patch, as that will be done in following patches. Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- apply.c | 62 + apply.h | 8 +++- builtin/apply.c | 2 +- 3 files changed, 48 insertions(

[PATCH v10 36/40] usage: add set_warn_routine()

There are already set_die_routine() and set_error_routine(), so let's add set_warn_routine() as this will be needed in a following commit. Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- git-compat-util.h | 1 + usage.c | 5 + 2 files changed, 6 insertions(+)

[PATCH v10 24/40] builtin/apply: make write_out_one_result() return -1 on error

ng instead of calling exit(). Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 38 -- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index fdfeab0..003acec 100644 --- a/builtin/apply

[PATCH v10 38/40] apply: change error_routine when silent

ler <sbel...@google.com> Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- apply.c | 21 - apply.h | 8 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/apply.c b/apply.c index ddbb0a2..bf81b70 100644 --- a/apply.c +++ b/apply.c @@

[PATCH v10 39/40] apply: refactor `git apply` option parsing

es.plus.com> Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- apply.c | 103 +--- apply.h | 18 +++--- builtin/apply.c | 74 ++-- 3 files changed, 97 insertions(+), 98 dele

[PATCH v10 16/40] builtin/apply: make gitdiff_*() return 1 at end of header

ase of a real error. This will be done in a following patch. Helped-by: Nguyễn Thái Ngọc Duy <pclo...@gmail.com> Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 12 +--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/builtin/ap

[PATCH v10 28/40] builtin/apply: rename option parsing functions

As these functions are going to be part of the libified apply api, let's give them a name that is more specific to the apply api. Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 40 1 file changed, 20 insertions(

[PATCH v10 18/40] builtin/apply: change die_on_unsafe_path() to check_unsafe_path()

that let's change its name to check_unsafe_path(). Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 32 +--- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 6b16173..166e94d 1006

[PATCH v10 35/40] apply: don't print on stdout in verbosity_silent mode

values and calls printing functions, - summary_patch_list() calls show_file_mode_name(), printf(), show_rename_copy(), show_mode_change() that are only printing. Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- apply.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

[PATCH v10 13/40] builtin/apply: move check_apply_state() to apply.c

To libify `git apply` functionality we must make check_apply_state() usable outside "builtin/apply.c". Let's do that by moving it into "apply.c". Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- apply.c | 32 apply

[PATCH v10 17/40] builtin/apply: make gitdiff_*() return -1 on error

m> Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 40 +--- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index eb918e5..6b16173 100644 --- a/builtin/apply.c +++ b/builtin/appl

[PATCH v10 01/40] apply: make some names more specific

To prepare for some structs and constants being moved from builtin/apply.c to apply.h, we should give them some more specific names to avoid possible name collisions in th global namespace. Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 20 ++---

[PATCH v10 14/40] builtin/apply: make apply_all_patches() return 128 or 1 on error

to init_apply_state() many times to be reused by series of calls to the apply lib functions. Helped-by: Nguyễn Thái Ngọc Duy <pclo...@gmail.com> Helped-by: Johannes Schindelin <johannes.schinde...@gmx.de> Helped-by: Eric Sunshine <sunsh...@sunshineco.com> Signed-off-by: Christian Couder <ch

[PATCH v10 07/40] builtin/apply: make parse_single_patch() return -1 on error

() and let's adjust the related test cases accordingly. Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c| 17 + t/t4012-diff-binary.sh | 4 ++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/builtin/apply.c b/builtin/a

[PATCH v10 26/40] builtin/apply: make try_create_file() return -1 on error

returns -1 to signal a recoverable error. To fix that, let's make it return 1 in case of a recoverable error and -1 in case of an unrecoverable error. Helped-by: Eric Sunshine <sunsh...@sunshineco.com> Helped-by: Jeff King <p...@peff.net> Signed-off-by: Christian Couder <chrisc...@tu

[PATCH v10 40/40] builtin/am: use apply api in run_apply()

ot; with split index: 1m22.476s This series on top of "next" without split index: 1m12.034s This series on top of "next" with split index: 0m15.678s (using branch "next" from mid April 2016.) Benchmarked-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com>

[PATCH v10 08/40] builtin/apply: make parse_whitespace_option() return -1 instead of die()ing

To libify `git apply` functionality we have to signal errors to the caller instead of die()ing. To do that in a compatible manner with the rest of the error handling in builtin/apply.c, parse_whitespace_option() should return -1 instead of calling die(). Signed-off-by: Christian Couder <chr

[PATCH v10 19/40] builtin/apply: make build_fake_ancestor() return -1 on error

ine <sunsh...@sunshineco.com> Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 41 ++--- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 166e94d..575981b 100644 --- a/builtin

[PATCH v10 10/40] builtin/apply: move init_apply_state() to apply.c

To libify `git apply` functionality we must make init_apply_state() usable outside "builtin/apply.c". Let's do that by moving it into a new "apply.c". Helped-by: Eric Sunshine <sunsh...@sunshineco.com> Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> ---

[PATCH v10 04/40] builtin/apply: read_patch_file() return -1 instead of die()ing

To libify `git apply` functionality we have to signal errors to the caller instead of die()ing. Let's do that by returning -1 instead of die()ing in read_patch_file(). Helped-by: Stefan Beller <sbel...@google.com> Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin

[PATCH v10 06/40] builtin/apply: make parse_chunk() return a negative integer on error

() is called only by apply_patch() which already returns either -1 or -128 when an error happened, let's make it also return -1 or -128. This makes it compatible with what find_header() and parse_binary() already return. Helped-by: Eric Sunshine <sunsh...@sunshineco.com> Signed-off-by: Chr

[PATCH v10 03/40] builtin/apply: make apply_patch() return -1 or -128 instead of die()ing

-128 and it will exit(1) when it returns -1. We exit() with code 128 because that was what die() was doing and we want to keep the distinction between exiting with code 1 and exiting with code 128. Helped-by: Eric Sunshine <sunsh...@sunshineco.com> Signed-off-by: Christian Couder &

[PATCH v10 09/40] builtin/apply: make parse_ignorewhitespace_option() return -1 instead of die()ing

To libify `git apply` functionality we have to signal errors to the caller instead of die()ing. To do that in a compatible manner with the rest of the error handling in "builtin/apply.c", parse_ignorewhitespace_option() should return -1 instead of calling die(). Signed-off-by: Christ

[PATCH v10 05/40] builtin/apply: make find_header() return -128 instead of die()ing

find_header() already returns -1 when no header is found. Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 40 t/t4254-am-corrupt.sh | 2 +- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/builtin/app

[PATCH v10 11/40] apply: make init_apply_state() return -1 instead of exit()ing

To libify `git apply` functionality we have to signal errors to the caller instead of exit()ing. To do that in a compatible manner with the rest of the error handling in "builtin/apply.c", init_apply_state() should return -1 instead of calling exit(). Signed-off-by: Christian Coud

<    12   13   14   15   16   17   18   19   20   21   >