[PATCH v8 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 v8 23/41] builtin/apply: make create_file() return -1 on error

returning instead of calling exit(). Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 25 + 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index eadff4d..bce3988 100644 --- a/builtin/apply

[PATCH v8 27/41] 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 v8 40/41] 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 v8 32/41] environment: add set_index_file()

*/ ... /* When finished reset the index file */ set_index_file(old_index_file); Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- cache.h | 1 + environment.c | 10 ++ 2 files changed, 11 insertions(+) diff --git a/cache.h b/cache.h index c73becb..8854365

[PATCH v8 33/41] write_or_die: use warning() instead of fprintf(stderr, ...)

-by: Christian Couder <chrisc...@tuxfamily.org> --- write_or_die.c | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/write_or_die.c b/write_or_die.c index 49e80aa..c29f677 100644 --- a/write_or_die.c +++ b/write_or_die.c @@ -87,8 +87,7 @@ int write_or_whine_pipe(int fd,

Re: git-svn aborts with "Use of uninitialized value $u" when a non-svn-backed branch is present in remote

On Fri, Jun 24, 2016 at 10:06 PM, Eric Wong wrote: > Please don't drop Cc:, re-adding git@vger and Christian > > Jacob Godserv wrote: >> > Christian (Cc-ed) also noticed the problem a few weeks ago >> > and took a more drastic approach by having git-svn

Draft of Git Rev News edition 12

Hi, A draft of Git Rev News edition 12 is available here: https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-12.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: Add Cc,Tested-by list while 'git commit'

On Sun, Feb 7, 2016 at 4:23 PM, Jagan Teki wrote: > Do we have any git config options to add Cc and Tested-by list like > Signed-off-by is fetched from git config. > > example: > > $ git commit -s > > Cc: Arjun Ani > Tested-by: Jagan Teki

Re: [PATCH v4 06/12] ref-filter: introduce color_atom_parser()

On Sat, Feb 6, 2016 at 4:20 PM, Karthik Nayak wrote: > On Fri, Feb 5, 2016 at 3:55 AM, Eric Sunshine wrote: >> On Sun, Jan 31, 2016 at 12:42 PM, Karthik Nayak >> wrote: >>> Introduce color_atom_parser() which will parse a

Re: GSoC 2016: applications open, deadline = Fri, 19/2

Hi, On Wed, Feb 10, 2016 at 10:31 AM, Matthieu Moy wrote: > > So, the first question is: are there volunteers to be GSoC mentors this > year? I can co-mentor this year too, with you or someone else. With you I think it will work out even if you have less time than

[ANNOUNCE] Git Rev News edition 12

Hi everyone, I'm happy announce that the 12th edition of Git Rev News is now published: http://git.github.io/rev_news/2016/02/10/edition-12/ Thanks a lot to all the contributors, especially Thomas Gummerer! Enjoy, Christian, Thomas and Nicola. -- To unsubscribe from this list: send the line

[PATCH v8 09/11] config: add core.untrackedCache

orsten Bögershausen <tbo...@web.de> Helped-by: Stefan Beller <sbel...@google.com> Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> read-cache: Duy'sfixup Signed-off-by: Christian Couder <chrisc...@

[PATCH v8 11/11] t7063: add tests for core.untrackedCache

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- t/t7063-status-untracked-cache.sh | 85 +-- 1 file changed, 81 insertions(+), 4 deletions(-) diff --git a/t/t7063-status-untracked-cache.sh b/t/t7063-status-untracked-cache.sh index 2

[PATCH v8 10/11] test-dump-untracked-cache: don't modify the untracked cache

a mechanism to prevent read_index_from() from changing the untracked cache state when it's called from test-dump-untracked-cache. Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- cache.h | 7 +++ config.c| 4 environment.c

[PATCH v8 08/11] dir: simplify untracked cache "ident" field

version is stored in the ident field. As we now compare with just the kernel name the comparison will fail and the untracked cache will be disabled until it's recreated. Helped-by: Torsten Bögershausen <tbo...@web.de> Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> ---

[PATCH v8 04/11] update-index: add untracked cache notifications

tory tests are performed. This makes it easy to spot any problem. Also in verbose mode, let's tell the user when the cache is enabled or disabled. Helped-by: Duy Nguyen <pclo...@gmail.com> Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/update-index.c | 14

[PATCH v8 02/11] update-index: use enum for untracked cache options

Helped-by: Duy Nguyen <pclo...@gmail.com> Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/update-index.c | 18 +- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/builtin/update-index.c b/builtin/update-index.c index a6fff87..1e

[PATCH v8 06/11] dir: add {new,add}_untracked_cache()

Factor out code into new_untracked_cache() and add_untracked_cache(), which will be used in later commits. Helped-by: Eric Sunshine <sunsh...@sunshineco.com> Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/update-index.c | 11 +-- dir.c

[PATCH v8 05/11] update-index: move 'uc' var declaration

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/update-index.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/builtin/update-index.c b/builtin/update-index.c index 369c207..fe7aaa3 100644 --- a/builtin/update-index.c +++ b/builtin/update-i

[PATCH v8 07/11] dir: add remove_untracked_cache()

Factor out code into remove_untracked_cache(), which will be used in a later commit. Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/update-index.c | 6 +- dir.c | 9 + dir.h | 1 + 3 files changed, 11 insertions(+), 5 del

[PATCH v8 01/11] dir: free untracked cache when removing it

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/update-index.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/update-index.c b/builtin/update-index.c index 7431938..a6fff87 100644 --- a/builtin/update-index.c +++ b/builtin/update-index.c @@ -1123,6 +

[PATCH v8 03/11] update-index: add --test-untracked-cache

It is nice to just be able to test if untracked cache is supported without enabling it. Helped-by: David Turner <dtur...@twopensource.com> Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- Documentation/git-update-index.txt | 12 +++- builtin/update-index.c

[PATCH v8 00/11] Untracked cache improvements

patch series is also available there: https://github.com/chriscool/git/tree/uc-notifs71 Christian Couder (11): dir: free untracked cache when removing it update-index: use enum for untracked cache options update-index: add --test-untracked-cache update-index: add untracked cache notifications

Re: [PATCH v7 01/11] dir: free untracked cache when removing it

On Mon, Jan 25, 2016 at 8:16 PM, Stefan Beller <sbel...@google.com> wrote: > On Sun, Jan 24, 2016 at 7:28 AM, Christian Couder > <christian.cou...@gmail.com> wrote: >> Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> >> --- >> builtin/update-ind

Re: [PATCH v7 09/11] config: add core.untrackedCache

On Mon, Jan 25, 2016 at 9:47 PM, Junio C Hamano <gits...@pobox.com> wrote: > Christian Couder <christian.cou...@gmail.com> writes: > >> diff --git a/read-cache.c b/read-cache.c >> index 5be7cd1..a04ec8c 100644 >> --- a/read-cache.c >> +++ b/read-cache.

Re: [PATCH v3 12/15] ref-filter: align: introduce long-form syntax

On Tue, Jan 5, 2016 at 9:03 AM, Karthik Nayak wrote: > Introduce optional prefixes "width=" and "position=" for the align atom > so that the atom can be used as "%(align:width=,position=)". > > Add Documetation and tests for the same. s/Documetation/Documentation/ Thanks!

Rebase performance

Hi, Using GIT_TRACE_PERFORMANCE it looks like a lot of time in a regular rebase is spent in run_apply() in builtin/am.c. This function first sets up a 'struct child_process cp' to launch "git apply" on a patch and then uses run_command() to actually launch the "git apply". Then this function

Re: [PATCH 02/16] bisect: add test for the bisect algorithm

On Fri, Feb 26, 2016 at 3:04 AM, Stephan Beyer wrote: > Signed-off-by: Stephan Beyer > --- > > To be honest: the test could be better, it could be more "targeted", > i.e. the example commit history could be smaller and just consider > all the cases and corner

GIT_TRACE_PERFORMANCE and pager

Hi, It looks like setting GIT_TRACE_PERFORMANCE to 1 or 2 (for stdout or stderr) does not always work well with commands that use a pager, for example: - > GIT_TRACE_PERFORMANCE=2 git log -1 commit f02fbc4f9433937ee0463d0342d6d7d97e1f6f1e Author: Junio C Hamano

[PATCH] Documentation: talk about pager in api-trace.txt

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- Documentation/technical/api-trace.txt | 43 +++ 1 file changed, 43 insertions(+) diff --git a/Documentation/technical/api-trace.txt b/Documentation/technical/api-trace.txt index 097a651..a10b3a9

Re: GIT_TRACE_PERFORMANCE and pager

On Mon, Feb 29, 2016 at 12:39 PM, Jeff King <p...@peff.net> wrote: > On Mon, Feb 29, 2016 at 12:25:49PM +0100, Christian Couder wrote: > >> Setting GIT_TRACE to 1 or 2 seems to work, but maybe it is because it >> outputs stuff at the beginning of the process and not at th

Re: [ANNOUNCE] Git v2.8.0-rc0

On Sat, Feb 27, 2016 at 12:41 AM, Junio C Hamano wrote: > > Git 2.8 Release Notes (draft) > = > > Backward compatibility note > --- > > The rsync:// transport has been removed. We may want to add something about untracked

Re: [PATCH 02/16] bisect: add test for the bisect algorithm

Hi Stephan, On Fri, Feb 26, 2016 at 10:38 PM, Stephan Beyer <s-be...@gmx.net> wrote: > Hi Christian, > > On 02/26/2016 07:53 AM, Christian Couder wrote: >>> +test_expect_success 'bisect algorithm works in linear history with an odd >>> number of commits'

Re: Rebase performance

On Thu, Feb 25, 2016 at 10:42 AM, Duy Nguyen <pclo...@gmail.com> wrote: > On Thu, Feb 25, 2016 at 7:50 AM, Duy Nguyen <pclo...@gmail.com> wrote: >> On Thu, Feb 25, 2016 at 5:09 AM, Christian Couder >> <christian.cou...@gmail.com> wrote: >>> Another pos

Re: [PATCH v6 02/11] update-index: use enum for untracked cache options

On Sat, Jan 23, 2016 at 1:44 AM, Duy Nguyen <pclo...@gmail.com> wrote: > On Wed, Jan 20, 2016 at 4:59 PM, Christian Couder > <christian.cou...@gmail.com> wrote: >> Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> >> Helped-by: Duy Nguyen <pclo...@gma

[PATCH v7 03/11] update-index: add --test-untracked-cache

It is nice to just be able to test if untracked cache is supported without enabling it. Helped-by: David Turner <dtur...@twopensource.com> Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- Documentation/git-update-index.txt | 12 +++- builtin/update-index.c

[PATCH v7 01/11] dir: free untracked cache when removing it

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/update-index.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/update-index.c b/builtin/update-index.c index 7431938..a6fff87 100644 --- a/builtin/update-index.c +++ b/builtin/update-index.c @@ -1123,6 +

[PATCH v7 02/11] update-index: use enum for untracked cache options

Helped-by: Duy Nguyen <pclo...@gmail.com> Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/update-index.c | 18 +- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/builtin/update-index.c b/builtin/update-index.c index a6fff87..1e

[PATCH v7 00/11] Untracked cache improvements

v6 are mostly small updates. The patch series is also available there: https://github.com/chriscool/git/tree/uc-notifs70 Thanks to the reviewers and helpers. Christian Couder (11): dir: free untracked cache when removing it update-index: use enum for untracked cache options update-index: a

[PATCH v7 08/11] dir: simplify untracked cache "ident" field

version is stored in the ident field. As we now compare with just the kernel name the comparison will fail and the untracked cache will be disabled until it's recreated. Helped-by: Torsten Bögershausen <tbo...@web.de> Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> ---

[PATCH v7 09/11] config: add core.untrackedCache

orsten Bögershausen <tbo...@web.de> Helped-by: Stefan Beller <sbel...@google.com> Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> read-cache: Duy'sfixup Signed-off-by: Christian Couder <chrisc...@

[PATCH v7 11/11] t7063: add tests for core.untrackedCache

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- t/t7063-status-untracked-cache.sh | 85 +-- 1 file changed, 81 insertions(+), 4 deletions(-) diff --git a/t/t7063-status-untracked-cache.sh b/t/t7063-status-untracked-cache.sh index 2

[PATCH v7 04/11] update-index: add untracked cache notifications

tory tests are performed. This makes it easy to spot any problem. Also in verbose mode, let's tell the user when the cache is enabled or disabled. Helped-by: Duy Nguyen <pclo...@gmail.com> Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/update-index.c | 14

[PATCH v7 05/11] update-index: move 'uc' var declaration

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/update-index.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/builtin/update-index.c b/builtin/update-index.c index 369c207..fe7aaa3 100644 --- a/builtin/update-index.c +++ b/builtin/update-i

[PATCH v7 06/11] dir: add {new,add}_untracked_cache()

Factor out code into new_untracked_cache() and add_untracked_cache(), which will be used in later commits. Helped-by: Eric Sunshine <sunsh...@sunshineco.com> Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/update-index.c | 11 +-- dir.c

[PATCH v7 10/11] test-dump-untracked-cache: don't modify the untracked cache

a mechanism to prevent read_index_from() from changing the untracked cache state when it's called from test-dump-untracked-cache. Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- cache.h | 7 +++ config.c| 4 environment.c

[PATCH v7 07/11] dir: add remove_untracked_cache()

Factor out code into remove_untracked_cache(), which will be used in a later commit. Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/update-index.c | 6 +- dir.c | 9 + dir.h | 1 + 3 files changed, 11 insertions(+), 5 del

Re: [PATCH v6 09/11] config: add core.untrackedCache

On Sat, Jan 23, 2016 at 1:56 AM, Stefan Beller <sbel...@google.com> wrote: > On Wed, Jan 20, 2016 at 1:59 AM, Christian Couder > <christian.cou...@gmail.com> wrote: >> When we know that mtime on directory the environment gives us is >> usable for the purpose o

Re: GSoC 2016: applications open, deadline = Fri, 19/2

Hi Johannes, On Wed, Feb 17, 2016 at 2:09 PM, Johannes Schindelin wrote: > >> Then there is also git-bisect.sh with nearly 700 lines, which is also >> not as easy. > > Nothing is easy, but bisect has a much better chance to be finally > converted into a builtin: there

[RFC/PATCH 00/48] Libifying git apply

onder if it is worth it to try to be consistent, and maybe also to try to save some memory. Related to this, some of the variables for these options have not been moved into the "apply_state" structure, because they are not global to the file, but maybe for consistency they should be. Ch

[RFC/PATCH 39/48] builtin/apply: move 'applied_after_fixing_ws' into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index a2e1e51..9a2b8af 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -82,6 +82,7 @@

[RFC/PATCH 31/48] builtin/apply: move 'has_include' global into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 186e451..fa2940d 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -73,6 +73,7 @@ struct apply

[RFC/PATCH 29/48] builtin/apply: move 'patch_input_file' global into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 28 ++-- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 70bb51a..e94594d 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@

[RFC/PATCH 30/48] builtin/apply: move 'limit_by_name' global into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 23 ++- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index e94594d..186e451 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -71,6

[RFC/PATCH 38/48] builtin/apply: move 'squelch_whitespace_errors' into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 3c00551..a2e1e51 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -81,6

[RFC/PATCH 35/48] builtin/apply: move 'whitespace_error' global into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 27 ++- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 8571646..1d665c2 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@

[RFC/PATCH 36/48] builtin/apply: move 'whitespace_option' into 'struct apply_state'

This will enable further refactoring. Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 1d665c2..63eb031 100644 --- a/builtin/apply.c

[RFC/PATCH 37/48] builtin/apply: remove whitespace_option arg from set_default_whitespace_mode()

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 63eb031..3c00551 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -148,10 +148,9 @@ stati

[RFC/PATCH 41/48] builtin/apply: move 'ws_ignore_action' into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 37 - 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index d427c3c..dbb9f0b 100644 --- a/builtin/apply.c +++ b/builtin/a

[RFC/PATCH 44/48] builtin/apply: move 'fn_table' global into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 45 +++-- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 3808d60..8fda1bd 100644 --- a/builtin/apply.c +++ b/b

[RFC/PATCH 34/48] builtin/apply: move 'root' global into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 82 ++--- 1 file changed, 49 insertions(+), 33 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index cb995c8..8571646 100644 --- a/builtin/apply.c

[RFC/PATCH 28/48] builtin/apply: move 'lock_file' global into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 44fdb9d..70bb51a 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -67,6 +67,8 @@

[RFC/PATCH 32/48] builtin/apply: move 'p_value' global into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 151 +--- 1 file changed, 99 insertions(+), 52 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index fa2940d..8d4a900 100644 --- a/builtin/apply.c

[RFC/PATCH 40/48] builtin/apply: move 'ws_error_action' into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 62 +++-- 1 file changed, 34 insertions(+), 28 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 9a2b8af..d427c3c 100644 --- a/builtin/apply.c

[RFC/PATCH 33/48] builtin/apply: move 'p_value_known' global into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 8d4a900..cb995c8 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -67,6 +67,7 @@

[RFC/PATCH 42/48] builtin/apply: move 'max_change' and 'max_len' into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 49 + 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index dbb9f0b..79224fd 100644 --- a/builtin/apply.c +++ b/b

[RFC/PATCH 06/48] builtin/apply: introduce 'struct apply_state' to start libifying

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 94 ++--- 1 file changed, 56 insertions(+), 38 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 838e46a..462e28f 100644 --- a/builtin/apply.c

[RFC/PATCH 19/48] builtin/apply: move 'summary' global into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 0378465..1542dcf 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -40,6 +40,8 @@

[RFC/PATCH 09/48] builtin/apply: move 'check' global into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 16 +--- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index d5bc30f..37879de 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -26,12 +26,15 @@

[RFC/PATCH 26/48] builtin/apply: move 'apply' global into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 31 +-- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 6e347e2..6342b61 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@

[RFC/PATCH 11/48] builtin/apply: move 'apply_in_reverse' global into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 51 --- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 9bc01a8..6bf3024 100644 --- a/builtin/apply.c

[RFC/PATCH 23/48] builtin/apply: move 'line_termination' global into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 13 - 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 0c2fa2e..cc90773 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -60,6 +60,8 @@

[RFC/PATCH 07/48] builtin/apply: move 'newfd' global into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 462e28f..d56dd9f 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -24,6 +24,7 @@

[RFC/PATCH 27/48] builtin/apply: move 'read_stdin' global into cmd_apply()

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/apply.c b/builtin/apply.c index 6342b61..44fdb9d 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -95,7 +95,6 @@ static enum ws_

[RFC/PATCH 14/48] builtin/apply: move 'update_index' global into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 46 +++--- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 4e0737c..a6026cc 100644 --- a/builtin/apply.c +++ b/b

[RFC/PATCH 18/48] builtin/apply: move 'numstat' global into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index fd5cb7d..0378465 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -37,6 +37,9 @@

[RFC/PATCH 24/48] builtin/apply: move 'fake_ancestor' global into 'struct apply_state'

By the way remove comment about '--index-info' that was renamed '--build-fake-ancestor' in commit 26b28007689d27a921ea90e5a29fc8eb74b0d297 (apply: get rid of --index-info in favor of --build-fake-ancestor, Sep 17 2007). Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- b

[RFC/PATCH 05/48] builtin/apply: move 'options' variable into cmd_apply()

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/apply.c b/builtin/apply.c index 7d7a8ab..838e46a 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -79,7 +79,6 @@ static enum ws_

[RFC/PATCH 04/48] builtin/apply: extract line_by_line_fuzzy_match() from match_fragment()

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 125 1 file changed, 71 insertions(+), 54 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index c99c859..7d7a8ab 100644 --- a/builtin/apply.c

[RFC/PATCH 43/48] builtin/apply: move 'linenr' global into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 75 ++--- 1 file changed, 40 insertions(+), 35 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 79224fd..3808d60 100644 --- a/builtin/apply.c

[RFC/PATCH 48/48] builtin/apply: move applying patches into apply_all_patches()

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 128 ++-- 1 file changed, 69 insertions(+), 59 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 3f76469..9611b1a 100644 --- a/builtin/apply.c

[RFC/PATCH 47/48] builtin/apply: move 'state' check into check_apply_state()

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 52 +--- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 1676ce1..3f76469 100644 --- a/builtin/apply.c

[RFC/PATCH 46/48] builtin/apply: move 'state' init into init_apply_state()

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 43 --- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 66ebc9b..1676ce1 100644 --- a/builtin/apply.c +++ b/b

[RFC/PATCH 45/48] builtin/apply: move 'symlink_changes' global into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 50 -- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 8fda1bd..66ebc9b 100644 --- a/builtin/apply.c

[RFC/PATCH 21/48] builtin/apply: move 'no-add' global into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index fab731f..ae734cf 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -44,6 +44,8 @@ struct apply

[RFC/PATCH 17/48] builtin/apply: move 'diffstat' global into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 85aa817..fd5cb7d 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -34,6 +34,9 @@

[RFC/PATCH 13/48] builtin/apply: move 'apply_verbosely' global into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index fcb3c14..4e0737c 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -28,6

[RFC/PATCH 15/48] builtin/apply: move 'allow_overlap' global into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index a6026cc..e3ca5c9 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -26,6 +26,7 @@

[RFC/PATCH 16/48] builtin/apply: move 'cached' global into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 37 + 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index e3ca5c9..85aa817 100644 --- a/builtin/apply.c +++ b/builtin/a

[RFC/PATCH 20/48] builtin/apply: move 'threeway' global into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 15 --- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 1542dcf..fab731f 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -42,6 +42,8 @@

[RFC/PATCH 10/48] builtin/apply: move 'check_index' global into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 69 + 1 file changed, 40 insertions(+), 29 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 37879de..9bc01a8 100644 --- a/builtin/apply.c

[RFC/PATCH 08/48] builtin/apply: move 'unidiff_zero' global into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 42 -- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index d56dd9f..d5bc30f 100644 --- a/builtin/apply.c +++ b/b

[RFC/PATCH 03/48] builtin/apply: avoid local variable shadowing 'len' parameter

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 3f740c7..c99c859 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -2196,17 +2

[RFC/PATCH 02/48] builtin/apply: avoid parameter shadowing 'linenr' global

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 7d9be63..3f740c7 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -1525,7 +1525,7 @@ stat

[RFC/PATCH 01/48] builtin/apply: avoid parameter shadowing 'p_value' global

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 42c610e..7d9be63 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -469,7

[RFC/PATCH 25/48] builtin/apply: move 'p_context' global into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 5a2f0f4..6e347e2 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -64,12 +64,13 @@

[RFC/PATCH 22/48] builtin/apply: move 'unsafe_paths' global into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index ae734cf..0c2fa2e 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -58,6 +58,8 @@

[RFC/PATCH 12/48] builtin/apply: move 'apply_with_reject' global into 'struct apply_state'

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org> --- builtin/apply.c | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 6bf3024..fcb3c14 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -27,6 +27,7 @@

Re: [RFC/PATCH 04/48] builtin/apply: extract line_by_line_fuzzy_match() from match_fragment()

On Wed, Mar 9, 2016 at 11:55 PM, Stefan Beller <sbel...@google.com> wrote: > On Wed, Mar 9, 2016 at 9:48 AM, Christian Couder > <christian.cou...@gmail.com> wrote: > > Some words in the commit message would be nice here as this is one of > the patches, > which

<    7   8   9   10   11   12   13   14   15   16   >