[PATCH 61/83] builtin/apply: libify check_apply_state()

Signed-off-by: Christian Couder --- builtin/apply.c | 16 +--- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index e3ee199..7576ec5 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -4534,17 +4534,17 @@

[PATCH 59/83] builtin/apply: move init_apply_state() to apply.c

Signed-off-by: Christian Couder --- Makefile| 1 + apply.c | 80 + apply.h | 8 ++ builtin/apply.c | 75 - 4 files changed, 89

[PATCH 77/83] apply: rename and move opt constants to apply.h

Signed-off-by: Christian Couder --- apply.h | 3 +++ builtin/apply.c | 11 --- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apply.h b/apply.h index 35d4d15..3df0128 100644 --- a/apply.h +++ b/apply.h @@ -129,4 +129,7 @@ extern int

[PATCH 67/83] builtin/apply: make build_fake_ancestor() return -1 on error

Signed-off-by: Christian Couder --- builtin/apply.c | 28 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 8b7a8e0..69bb94c 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -3891,7

[PATCH 60/83] apply: libify init_apply_state()

Signed-off-by: Christian Couder --- apply.c | 7 --- apply.h | 2 +- builtin/apply.c | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/apply.c b/apply.c index 9c5f258..11bec48 100644 --- a/apply.c +++ b/apply.c @@ -56,7 +56,7 @@

[PATCH 62/83] builtin/apply: move check_apply_state() to apply.c

Signed-off-by: Christian Couder --- apply.c | 29 + apply.h | 2 +- builtin/apply.c | 29 - 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/apply.c b/apply.c index 11bec48..b29cc64

[PATCH 46/83] builtin/apply: move 'state' check into check_apply_state()

Signed-off-by: Christian Couder --- builtin/apply.c | 52 +--- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index f2dffa9..94bf120 100644 --- a/builtin/apply.c +++

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

Signed-off-by: Christian Couder --- builtin/apply.c | 13 - 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index c45e481..228595d 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -59,6 +59,8 @@ struct

[PATCH 33/83] builtin/apply: move 'root' global into 'struct apply_state'

Signed-off-by: Christian Couder --- builtin/apply.c | 82 ++--- 1 file changed, 49 insertions(+), 33 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index fecdb66..209a1b4 100644 --- a/builtin/apply.c +++

[PATCH 36/83] builtin/apply: remove whitespace_option arg from set_default_whitespace_mode()

Signed-off-by: Christian Couder --- builtin/apply.c | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 64bc3e9..401e111 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -147,10 +147,9 @@ static void

[PATCH 32/83] builtin/apply: move 'p_value_known' global into 'struct apply_state'

Signed-off-by: Christian Couder --- builtin/apply.c | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 979849c..fecdb66 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -66,6 +66,7 @@ struct

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

Signed-off-by: Christian Couder --- builtin/apply.c | 42 -- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 51e6af4..ad81210 100644 --- a/builtin/apply.c +++

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

Signed-off-by: Christian Couder --- builtin/apply.c | 69 + 1 file changed, 40 insertions(+), 29 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 6c628f6..3f8671c 100644 --- a/builtin/apply.c +++

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

Signed-off-by: Christian Couder --- builtin/apply.c | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index f69f982..b6d2343 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -63,6 +63,8 @@ struct

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

By the way remove a 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 ---

[PATCH 28/83] builtin/apply: move 'patch_input_file' global into 'struct apply_state'

Signed-off-by: Christian Couder --- builtin/apply.c | 28 ++-- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index be237d1..ab311c1 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -66,6

[PATCH 37/83] builtin/apply: move 'squelch_whitespace_errors' into 'struct apply_state'

Signed-off-by: Christian Couder --- builtin/apply.c | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 401e111..259f256 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -78,6 +78,7 @@

[PATCH 02/83] builtin/apply: avoid parameter shadowing 'p_value' global

Let's just rename the global 'state_p_value' as it will become 'state->p_value' in a following patch. Signed-off-by: Christian Couder --- builtin/apply.c | 34 +- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git

[PATCH 39/83] builtin/apply: move 'ws_error_action' into 'struct apply_state'

Signed-off-by: Christian Couder --- builtin/apply.c | 62 +++-- 1 file changed, 34 insertions(+), 28 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 52602af..7d91454 100644 --- a/builtin/apply.c +++

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

Signed-off-by: Christian Couder --- builtin/apply.c | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index ba828df..d90948a 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -33,6 +33,9 @@ struct

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

Signed-off-by: Christian Couder --- builtin/apply.c | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 16d78f9..e488879 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -39,6 +39,8 @@ struct

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

Signed-off-by: Christian Couder --- builtin/apply.c | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 67560e4..154679e 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -27,6 +27,7

[PATCH 06/83] builtin/apply: move 'options' variable into cmd_apply()

Signed-off-by: Christian Couder --- builtin/apply.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/apply.c b/builtin/apply.c index 02239d9..8fd8dbc 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -79,7 +79,6 @@ static enum ws_ignore {

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

Signed-off-by: Christian Couder --- builtin/apply.c | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 33a1f8f..506357c 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -43,6 +43,8 @@ struct apply_state

[PATCH 00/83] libify apply and use lib in am

This is a patch series about libifying `git apply` functionality, and using this libified functionality in `git am`, so that no 'git apply' process is spawn anymore. This makes `git am` significantly faster, so `git rebase`, when it uses the am backend, is also significantly faster. This has

[PATCH 01/83] builtin/apply: make gitdiff_verify_name() return void

As the value returned by gitdiff_verify_name() is put into the same variable that is passed as a parameter to this function, it is simpler to pass the address of the variable and have gitdiff_verify_name() change the variable itself. Signed-off-by: Christian Couder ---

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

Signed-off-by: Christian Couder --- builtin/apply.c | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index 755e0e3..67560e4 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -26,6 +26,7 @@ struct

[PATCH 03/83] builtin/apply: avoid parameter shadowing 'linenr' global

Signed-off-by: Christian Couder --- builtin/apply.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index e133b38..7115dc2 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -1516,7 +1516,7 @@ static int

[GIT PULL] l10n updates for maint branch (2.8.2)

Hi Junio, Please pull this update to the maint branch. It should have been merged to Git 2.8.0, but I was busy these weeks and forgot to check my private mailbox. The following changes since commit 26e4cbec4558ea21cd572bfc915a462f63c1ebb4: l10n: zh_CN: review for git v2.8.0 l10n round 2

Re: 0 bot for Git

Hi Luk, On Sun, 24 Apr 2016, Luke Diamand wrote: > On 24 Apr 2016 08:19, "Johannes Schindelin" > wrote: > > > > Hi Lars & Junio, > > > > On Fri, 22 Apr 2016, Junio C Hamano wrote: > > > > > Lars Schneider writes: > > > > > > > Thanks for

Re: 0 bot for Git

Hi Gábor, On Sun, 24 Apr 2016, SZEDER Gábor wrote: > > > Don't worry; I didn't feel offended. The Travis stuff running on > > > the branches at http://github.com/git/git would surely catch issues > > > on MacOSX and/or around git-p4 (neither of which I test myself when > > > merging to 'pu')

Re: 0 bot for Git

> > Don't worry; I didn't feel offended. The Travis stuff running on > > the branches at http://github.com/git/git would surely catch issues > > on MacOSX and/or around git-p4 (neither of which I test myself when > > merging to 'pu') before they hit 'next', and that is already helping > > us

[PATCH] t9824: fix broken &&-chain in a subshell

Signed-off-by: SZEDER Gábor --- As far as I can tell after eyeballing the test script, this was the only case where the &&-chain was broken. t/t9824-git-p4-git-lfs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t9824-git-p4-git-lfs.sh

Re: 0 bot for Git

Hi Lars & Junio, On Fri, 22 Apr 2016, Junio C Hamano wrote: > Lars Schneider writes: > > > Thanks for the explanation. My intention was not to be offensive. > > I was curious about your workflow and I was wondering if the > > Travis CI integration could be useful for

Re: [PATCH] string_list: use string-list API in unsorted_string_list_lookup()

Hi Ralf, On Fri, 22 Apr 2016, Ralf Thielow wrote: > Using the string-list API in function unsorted_string_list_lookup() > makes the code more readable. So let's do this. > > Signed-off-by: Ralf Thielow > --- > string-list.c | 9 + > 1 file changed, 5

Re: GSoC Project Selected | Incremental Rewrite of git bisect

Hi Pranit, On Sun, 24 Apr 2016, Pranit Bauva wrote: > I am Pranit Bauva studying Mining Engineering at Indian Institute of > Technology, Kharagpur. I have applied for Google Summer of Code 2016 > under Git organization and my project[1], "Incremental Rewrite of git > bisect has been selected

Re: [PATCH] name-rev: include taggerdate in considering the best name

Hi, [fixing Uwe's email address, as the address bounces that was recorded in the commit introducing the flawed behavior, and I failed to check mailmap earlier.] On Fri, 22 Apr 2016, Junio C Hamano wrote: > Linus Torvalds writes: > > > ... I think this is still

<    1   2