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

Signed-off-by: Christian Couder --- 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 @@ struct

[RFC/PATCH 10/48] 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 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 --- 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 +++

[RFC/PATCH 25/48] 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 5a2f0f4..6e347e2 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -64,12 +64,13 @@ struct

[RFC/PATCH 22/48] builtin/apply: move 'unsafe_paths' 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 ae734cf..0c2fa2e 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -58,6 +58,8 @@ struct

[RFC/PATCH 12/48] 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 6bf3024..fcb3c14 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -27,6 +27,7 @@ struct

[RFC/PATCH 02/48] 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 7d9be63..3f740c7 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -1525,7 +1525,7 @@ static int

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

Signed-off-by: Christian Couder --- 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 +469,7

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

Signed-off-by: Christian Couder --- 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 +2196,17

[RFC/PATCH 00/48] Libifying git apply

This is a patch series about libifying "git apply" functionality, to be able to use this functionality in "git am" without spawning new processes. This should make "git am" and "git rebase" significantly faster. This has been discussed in the following thread:

Re: GIT_CEILING_DIRECTORY

Barry Warsaw writes: > I put my home directory under git (recently converted from bzr), but since I > have some subdirectories under $HOME that are not under git (and some that > are) I want to stop e.g. `git status` from traversing up into $HOME. Let me understand the use

GIT_CEILING_DIRECTORY

I put my home directory under git (recently converted from bzr), but since I have some subdirectories under $HOME that are not under git (and some that are) I want to stop e.g. `git status` from traversing up into $HOME. For example, I have a ~/projects directory with lots of subdirectories so

Bug report: can't use git add with --patch option in "_" directory

I recently installed Git version 2.7.2.windows.1 (I am running Windows 7 64-bit). Since the update, I have been unable to run `git add` with the `-p` option on files within a certain directory (or its subdirectories) whose name is `_` (an underscore). `git status` correctly reports that my file

Re: Git has been accepted as a GSoC 2016 mentor organization!

On Wed, Mar 09, 2016 at 10:55:00AM +0100, Matthieu Moy wrote: > > Most of the resources are just pointers to our GSoC stuff. This does > > mean I've effectively signed our mentors up to participate in this > > program. I hope that's OK, > > Not sure whether I was supposed to receive something,

Re: Git has been accepted as a GSoC 2016 mentor organization!

Hi Peff, On Tue, 8 Mar 2016, Jeff King wrote: > I've effectively signed our mentors up to participate in this program. > I hope that's OK Speaking for myself, I think this is more than just okay. I really like the idea of more diversity in the Git community. Ciao, Dscho -- To unsubscribe from

RE: libcurl dependency for implementing RFC3161 timestamps

On March 9, 2016 6:41 AM, Duy Nguyen wrote: > To: Anton Wuerfel > Cc: Git Mailing List ; i4pa...@cs.fau.de; > phillip.raff...@fau.de > Subject: Re: libcurl dependency for implementing RFC3161 timestamps > > On Wed, Mar 9, 2016 at 6:24 PM, Anton Wuerfel

Re: libcurl dependency for implementing RFC3161 timestamps

On Wed, Mar 9, 2016 at 6:24 PM, Anton Wuerfel wrote: > -As git tag is a builtin part of the main git executable, introduce a > libcurl dependency for the main executable (maybe not best-practice). libcurl was part of the main executable and then split out because it

libcurl dependency for implementing RFC3161 timestamps

Hello, for implementing RFC3161 timestamps in git tag, HTTP POST requests have to be sent via libcurl. We already changed http.c to our needs. Is there any best-practice how to introduce this libcurl dependency? There are several options: -As git tag is a builtin part of the main git

Re: [PATCH 08/15] ref-filter: make "%(symref)" atom work with the ':short' modifier

On Wed, Mar 9, 2016 at 1:49 AM, Junio C Hamano wrote: > Karthik Nayak writes: > >> On Tue, Mar 8, 2016 at 7:26 AM, Jacob Keller wrote: >>> On Mon, Mar 7, 2016 at 3:08 PM, Junio C Hamano wrote: Karthik

[PATCH] dir.c: fix dir re-inclusion rules with "NODIR" and "MUSTBEDIR"

For NODIR case, the patterns look like this * # exclude dir, dir/file1 and dir/file2.. !dir # ..except that dir and everything inside is re-included.. dir/file2 # ..except (again!) that dir/file2 is excluded # ..which means dir/file1 stays included When

Re: Git has been accepted as a GSoC 2016 mentor organization!

Jeff King writes: > I've also signed us up for Outreachy, which is an internship program > designed to encourage open source participation by under-represented > groups. Good. In the case of the Git community, "under-represented" may even be a euphemism as it is now :-\. > Most

Re: Change in .gitignore handling: intended or bug?

On Wed, Mar 9, 2016 at 1:10 AM, Junio C Hamano wrote: > diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt > index 3ded6fd..91d1ce2 100644 > --- a/Documentation/gitignore.txt > +++ b/Documentation/gitignore.txt > @@ -148,7 +148,43 @@ excluded, the following

url..insteadOf used for server-side redirection?

Hello, There's a nice git config directive url.insteadOf (https://www.kernel.org/pub/software/scm/git/docs/git-config.html , search for "insteadOf"). However, than man doesn't make it explicit if it can be used in server-side repository config, and all examples on the net appear to be about its

<    1   2