Re: [RESEND PATCH] diff: recurse into nested submodules for inline diff

On Thu, May 4, 2017 at 2:43 PM, Stefan Beller wrote: > When fd47ae6a5b (diff: teach diff to display submodule difference with an > inline diff, 2016-08-31) was introduced, we did not think of recursing > into nested submodules. > > When showing the inline diff for submodules, automatically recurse

Re: [PATCH 3/3] protocol docs: explain receive-pack push options

Hi, Jonathan Tan wrote: > Support for push options in the receive-pack protocol (and all Git > components that speak it) have been added over a few commits, but not > fully documented (especially its interaction with signed pushes). Update > the protocol documentation to include the relevant deta

Re: [PATCH 2/3] receive-pack: verify push options in cert

Hi, Stefan Beller wrote: > On Fri, May 5, 2017 at 4:46 PM, Jonathan Tan wrote: >> This sets in stone the requirement that send-pack redundantly send its >> push options in 2 places, but I think that this is better than the >> alternatives. Sending push options only within the cert is >> backward

Re: [PATCH 2/3] receive-pack: verify push options in cert

Hi, Jonathan Tan wrote: > In commit f6a4e61 ("push: accept push options", 2016-07-14), send-pack > was taught to include push options both within the signed cert (if the > push is a signed push) and outside the signed cert; however, > receive-pack ignores push options within the cert, only handli

Re: [PATCH 3/3] protocol docs: explain receive-pack push options

On Fri, May 5, 2017 at 4:46 PM, Jonathan Tan wrote: > Support for push options in the receive-pack protocol (and all Git > components that speak it) have been added over a few commits, but not > fully documented (especially its interaction with signed pushes). Update > the protocol documentation t

Re: [PATCH 2/3] receive-pack: verify push options in cert

On 05/05, Stefan Beller wrote: > On Fri, May 5, 2017 at 4:46 PM, Jonathan Tan wrote: > > In commit f6a4e61 ("push: accept push options", 2016-07-14), send-pack > > was taught to include push options both within the signed cert (if the > > push is a signed push) and outside the signed cert; however

Re: [PATCH 2/3] receive-pack: verify push options in cert

On Fri, May 5, 2017 at 4:46 PM, Jonathan Tan wrote: > In commit f6a4e61 ("push: accept push options", 2016-07-14), send-pack > was taught to include push options both within the signed cert (if the > push is a signed push) and outside the signed cert; however, > receive-pack ignores push options w

Re: [PATCH 1/3] docs: correct receive.advertisePushOptions default

Jonathan Tan wrote: > In commit c714e45 ("receive-pack: implement advertising and receiving > push options", 2016-07-14), receive-pack was taught to (among other > things) advertise that it understood push options, depending on > configuration. It was documented that it advertised such ability by

Re: [PATCH 1/3] docs: correct receive.advertisePushOptions default

On Fri, May 5, 2017 at 4:50 PM, Brandon Williams wrote: > On 05/05, Jonathan Tan wrote: >> In commit c714e45 ("receive-pack: implement advertising and receiving >> push options", 2016-07-14), receive-pack was taught to (among other >> things) advertise that it understood push options, depending on

Re: [PATCH 1/3] docs: correct receive.advertisePushOptions default

On 05/05, Jonathan Tan wrote: > In commit c714e45 ("receive-pack: implement advertising and receiving > push options", 2016-07-14), receive-pack was taught to (among other > things) advertise that it understood push options, depending on > configuration. It was documented that it advertised such ab

[PATCH 2/3] receive-pack: verify push options in cert

In commit f6a4e61 ("push: accept push options", 2016-07-14), send-pack was taught to include push options both within the signed cert (if the push is a signed push) and outside the signed cert; however, receive-pack ignores push options within the cert, only handling push options outside the cert.

[PATCH 1/3] docs: correct receive.advertisePushOptions default

In commit c714e45 ("receive-pack: implement advertising and receiving push options", 2016-07-14), receive-pack was taught to (among other things) advertise that it understood push options, depending on configuration. It was documented that it advertised such ability by default; however, it actually

[PATCH 3/3] protocol docs: explain receive-pack push options

Support for push options in the receive-pack protocol (and all Git components that speak it) have been added over a few commits, but not fully documented (especially its interaction with signed pushes). Update the protocol documentation to include the relevant details. Signed-off-by: Jonathan Tan

[PATCH 0/3] Clarify interaction between signed pushes and push options

We noticed this when trying to use Git to make a signed push with push options to a server using JGit (which rejects such pushes because the Git client makes requests that are, strictly speaking, incompatible with the documented protocol). There have been several commits (see the commits linked in

Re: [PATCH 0/3] Port git-add--interactive.perl:status_cmd to C

On Fri, May 5, 2017 at 7:38 PM, Johannes Schindelin wrote: > But maybe you want to keep the naming a little more consistent with the > Perl script, e.g. instead of calling the function `print_modified()` call > it already `list()` (and rename it later to `list_and_choose()` once you > have taught

Re: [PATCH 2/3] add--interactive: add builtin helper for interactive add

On Sat, May 6, 2017 at 1:13 AM, Daniel Ferreira (theiostream) wrote: > On Fri, May 5, 2017 at 7:30 PM, Johannes Schindelin > wrote: >>> +static int git_add_interactive_config(const char *var, >> >> Not git_add_interactive__helper_config()? ;-) > > I don't get if you mean this ironically (because

Re: [PATCH 2/3] add--interactive: add builtin helper for interactive add

On Fri, May 5, 2017 at 7:30 PM, Johannes Schindelin wrote: >> +static int git_add_interactive_config(const char *var, > > Not git_add_interactive__helper_config()? ;-) I don't get if you mean this ironically (because of the verbosity) or if you do think this would be a good name ;P >> + for

Re: [PATCH 2/3] add--interactive: add builtin helper for interactive add

On Sat, May 6, 2017 at 12:30 AM, Johannes Schindelin wrote: > Hi Daniel, > > > On Fri, 5 May 2017, Daniel Ferreira wrote: >> +static void print_modified(void) >> +{ >> + int i; >> + struct add_interactive_status s; >> + const char *modified_fmt = _("%12s %12s %s"); > > We cannot really

Re: [PATCH] t7406: fix i18n expectation of error message

Am 05.05.2017 um 19:50 schrieb Ævar Arnfjörð Bjarmason: On Fri, May 5, 2017 at 7:38 PM, Stefan Beller wrote: The error message from "submodule update" is internationalized, which makes sense. The test however did not check for the translated version, but used a hardcoded string, which breaks th

Re: [PATCH 0/3] Port git-add--interactive.perl:status_cmd to C

Hi Daniel, On Fri, 5 May 2017, Daniel Ferreira wrote: > Hm, it looks like my GSoC project won't be in the Git organization, Yeah, rumors have it that you were quite a popular student and several organizations fought bloody wars over getting you... ;-) > although I'm still interested in going fo

Re: [PATCH 0/3] Port git-add--interactive.perl:status_cmd to C

Ævar Arnfjörð Bjarmason wrote: > On Fri, May 5, 2017 at 8:43 PM, Daniel Ferreira wrote: >> This series introduces git-add-interactive--helper (or should it be >> called git-add--interactive--helper?) as a builtin capable of doing >> what the Perl script's status_cmd() would do. > > The existing s

Re: [PATCH 0/3] Port git-add--interactive.perl:status_cmd to C

Hi, On Fri, 5 May 2017, Ævar Arnfjörð Bjarmason wrote: > On Fri, May 5, 2017 at 8:43 PM, Daniel Ferreira wrote: > > This series introduces git-add-interactive--helper (or should it be > > called git-add--interactive--helper?) as a builtin capable of doing > > what the Perl script's status_cmd()

Re: [PATCH 3/3] add--interactive: use add-interactive--helper for status_cmd

Hi Daniel, On Fri, 5 May 2017, Daniel Ferreira wrote: > Call the newly introduced git-add-interactive--helper builtin on > status_cmd() instead of relying on git-add--interactive's Perl > functions to build print the numstat. > > Signed-off-by: Daniel Ferreira > --- > git-add--interactive.per

Re: [PATCH 2/3] add--interactive: add builtin helper for interactive add

Hi Daniel, On Fri, 5 May 2017, Daniel Ferreira wrote: > Create a builtin helper for git-add--interactive, which right now is > only able to reproduce git-add--interactive.perl's status_cmd() > function, providing a summarized diff numstat to the user. > > This is the first step in an effort to

Re: [PATCH 2/3] add--interactive: add builtin helper for interactive add

On Fri, May 5, 2017 at 11:21 PM, Johannes Schindelin wrote: > Hi, > > On Fri, 5 May 2017, Ævar Arnfjörð Bjarmason wrote: > >> int cmd_add_interactive__helper(int argc, const char **argv, const char >> *prefix) >> { >> - int i, found_opt = 0; >> - >> - git_config(git_add_interactive_conf

Attn: fund owner Payment Notification,

Dear Sir, Please be informed that your payment $6.5 million US dollars has been approved. You are expected to contact Charles Anthony (Mr.) on: (officemail...@gmail.com) with the following for proper verification and claim processing Telephone; +1925-231-8472 on any development thus Note that you

Re: [PATCH 1/3] diff: export diffstat interface

Hi Daniel, On Fri, 5 May 2017, Daniel Ferreira wrote: > Make the diffstat interface (namely, the diffstat_t struct and > diff_flush_stat) no longer be internal to diff.c and allow it to be used > by other parts of git. > > This is helpful for code that may want to easily extract information > fr

Re: [PATCH 2/3] add--interactive: add builtin helper for interactive add

Hi, On Fri, 5 May 2017, Ævar Arnfjörð Bjarmason wrote: > int cmd_add_interactive__helper(int argc, const char **argv, const char > *prefix) > { > - int i, found_opt = 0; > - > - git_config(git_add_interactive_config, NULL); > + int opt_status = 0; > > - for (i = 1; i < argc;

Re: How to `git status' without scrambling modified with new, etc

On Fri, May 5, 2017 at 9:24 AM, Ævar Arnfjörð Bjarmason wrote: > On Fri, May 5, 2017 at 4:02 PM, Harry Putnam wrote: >> This is probably what everyone sees: >> >> When I run `git status'; I see modified and newfiles scrambled together >> >> Is there a trick or technique to make that output show

Re: Automating Coverity, was Re: [PATCH 00/26] Address a couple of issues identified by Coverity

Hi Stefan, On Fri, 28 Apr 2017, Johannes Schindelin wrote: > On Fri, 28 Apr 2017, Stefan Beller wrote: > > > On Thu, Apr 27, 2017 at 3:50 PM, Johannes Schindelin > > wrote: > > > > > I still have to find the time to figure out one more detail: how to > > > download and extract the Coverity to

Re: [PATCH 2/3] add--interactive: add builtin helper for interactive add

On Fri, May 5, 2017 at 8:43 PM, Daniel Ferreira wrote: > Create a builtin helper for git-add--interactive, which right now is > only able to reproduce git-add--interactive.perl's status_cmd() > function, providing a summarized diff numstat to the user. I'm not a user of add -i and didn't review t

[RFC 00/14] convert dir.c to take an index parameter

One of the things brought up on the list in the past few days has been migrating away from using the index compatibility macros. One of the issues brought up in that thread was how simply doing that conversion doesn't eliminate the reliance on global state (specifically the_index). If one day we

[RFC 09/14] dir: convert prep_exclude to take an index

Signed-off-by: Brandon Williams --- dir.c | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dir.c b/dir.c index b86d02ff9..50b5e720e 100644 --- a/dir.c +++ b/dir.c @@ -1046,7 +1046,9 @@ static struct exclude *last_exclude_matching_from_lists(struct dir_struct *di

[RFC 03/14] dir: convert directory_exists_in_index to take index

Signed-off-by: Brandon Williams --- dir.c | 22 -- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dir.c b/dir.c index 44307b963..5c635198d 100644 --- a/dir.c +++ b/dir.c @@ -1264,14 +1264,15 @@ enum exist_status { * the directory name; instead, use the case

[RFC 08/14] dir: convert add_excludes to take an index

Signed-off-by: Brandon Williams --- dir.c | 29 +++-- dir.h | 2 +- unpack-trees.c | 2 +- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dir.c b/dir.c index 497a2db85..b86d02ff9 100644 --- a/dir.c +++ b/dir.c @@ -730,7 +730,7 @@ stati

[RFC 11/14] dir: convert open_cached_dir to take an index

Signed-off-by: Brandon Williams --- dir.c | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dir.c b/dir.c index a15da672c..f08d30ee4 100644 --- a/dir.c +++ b/dir.c @@ -1664,6 +1664,7 @@ static void add_untracked(struct untracked_cache_dir *dir, const char *name)

[RFC 14/14] dir: convert fill_directory to take an index

Signed-off-by: Brandon Williams --- builtin/add.c | 2 +- builtin/clean.c| 2 +- builtin/grep.c | 2 +- builtin/ls-files.c | 2 +- dir.c | 6 -- dir.h | 4 +++- wt-status.c| 2 +- 7 files changed, 12 insertions(+), 8 deletions(-) diff --git a/bu

[RFC 10/14] dir: convert is_excluded to take an index

Signed-off-by: Brandon Williams --- builtin/add.c | 2 +- builtin/check-ignore.c | 3 ++- builtin/clean.c| 2 +- builtin/ls-files.c | 2 +- dir.c | 16 +--- dir.h | 5 - unpack-trees.c | 2 +- 7 files changed, 19

[RFC 07/14] dir: convert is_excluded_from_list to take an index

Signed-off-by: Brandon Williams --- dir.c | 5 +++-- dir.h | 6 -- unpack-trees.c | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dir.c b/dir.c index 077b756c2..497a2db85 100644 --- a/dir.c +++ b/dir.c @@ -1010,10 +1010,11 @@ static struct exclude *

[RFC 13/14] dir: convert read_directory to take an index

Signed-off-by: Brandon Williams --- dir.c | 16 dir.h | 4 +++- unpack-trees.c | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dir.c b/dir.c index 3318ebbcb..4eb8cb6a2 100644 --- a/dir.c +++ b/dir.c @@ -190,7 +190,7 @@ int fill_directo

[RFC 02/14] dir: convert read_skip_worktree_file_from_index to take an index

Signed-off-by: Brandon Williams --- dir.c | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dir.c b/dir.c index 97eadd45e..44307b963 100644 --- a/dir.c +++ b/dir.c @@ -588,7 +588,8 @@ void add_exclude(const char *string, const char *base, x->el = el; } -

[RFC 04/14] dir: convert get_dtype to take index

Signed-off-by: Brandon Williams --- dir.c | 23 +-- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dir.c b/dir.c index 5c635198d..4515f0083 100644 --- a/dir.c +++ b/dir.c @@ -48,7 +48,8 @@ struct cached_dir { static enum path_treatment read_directory_recursiv

[RFC 05/14] dir: convert dir_add* to take an index

Signed-off-by: Brandon Williams --- builtin/add.c | 3 ++- dir.c | 18 +++--- dir.h | 4 +++- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/builtin/add.c b/builtin/add.c index 9f53f020d..bf5e676e4 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -4

[RFC 12/14] dir: convert read_directory_recursive to take an index

Signed-off-by: Brandon Williams --- dir.c | 52 +--- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/dir.c b/dir.c index f08d30ee4..3318ebbcb 100644 --- a/dir.c +++ b/dir.c @@ -46,7 +46,8 @@ struct cached_dir { }; static enum pat

[RFC 06/14] dir: convert last_exclude_matching_from_list to take an index

Signed-off-by: Brandon Williams --- dir.c | 13 - 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dir.c b/dir.c index a508e8076..077b756c2 100644 --- a/dir.c +++ b/dir.c @@ -961,7 +961,8 @@ static struct exclude *last_exclude_matching_from_list(const char *pathname,

[RFC 01/14] dir: stop using the index compatibility macros

In order to make it clearer where the_index is being referenced, stop using the index compatibility macros in dir.c. This is to make it easier to identify the functions which need to be convert to taking in a 'struct index_state' as a parameter. The end goal would be to eliminate the need to refe

Re: [PATCH 0/3] Port git-add--interactive.perl:status_cmd to C

On Fri, May 5, 2017 at 8:43 PM, Daniel Ferreira wrote: > This series introduces git-add-interactive--helper (or should it be > called git-add--interactive--helper?) as a builtin capable of doing > what the Perl script's status_cmd() would do. The existing script is git-add--interactive.perl, so g

Re: [PATCH v1 1/2] travis-ci: setup "prove cache" in "script" step

On Fri, May 5, 2017 at 5:40 PM, Lars Schneider wrote: > The command that made the "prove cache" persistent across builds was > executed in the "before_install" step. Consequently, every job that > wanted to make use of the cache had to run this step. > > The "prove cache" is only used in the "scri

[PATCH 0/3] Port git-add--interactive.perl:status_cmd to C

Hm, it looks like my GSoC project won't be in the Git organization, although I'm still interested in going for this so I guess I'll send patches to implement my proposal anyway (although certainly in a slower pace than I would if on the program). This series introduces git-add-interactive--helper

[PATCH 3/3] add--interactive: use add-interactive--helper for status_cmd

Call the newly introduced git-add-interactive--helper builtin on status_cmd() instead of relying on git-add--interactive's Perl functions to build print the numstat. Signed-off-by: Daniel Ferreira --- git-add--interactive.perl | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git

[PATCH 2/3] add--interactive: add builtin helper for interactive add

Create a builtin helper for git-add--interactive, which right now is only able to reproduce git-add--interactive.perl's status_cmd() function, providing a summarized diff numstat to the user. This is the first step in an effort to convert git-add--interactive.perl to a C builtin, in search for bet

[PATCH 1/3] diff: export diffstat interface

Make the diffstat interface (namely, the diffstat_t struct and diff_flush_stat) no longer be internal to diff.c and allow it to be used by other parts of git. This is helpful for code that may want to easily extract information from files using the diff machinery, while flushing it differently fro

[PATCH v2] tests: fix tests broken under GETTEXT_POISON=YesPlease

The GETTEXT_POISON=YesPlease compile-time testing option added in my bb946bba76 ("i18n: add GETTEXT_POISON to simulate unfriendly translator", 2011-02-22) has been slowly bitrotting as strings have been marked for translation, and new tests have been added without running it. I brought this up on

Re: [RFC PATCH 00/10] Add blame to libgit

Jeff Smith writes: > Jeff Smith (10): > Remove unneeded dependency on blob.h from blame > Move textconv_object to be with other textconv methods > Add some missing definitions to header files > Remove unused parameter from get_origin() > Split blame origin into its own file > Move fak

Re: [PATCH] t7406: fix i18n expectation of error message

On Fri, May 5, 2017 at 10:50 AM, Ævar Arnfjörð Bjarmason wrote: > > I have a fix for this in my gettext fixup series (so far lingering on > the list, not in pu): > https://public-inbox.org/git/20170421185757.28978-1-ava...@gmail.com/ Oh, should have checked the list more closely before. > > The

Re: [RFC PATCH 07/10] Break out scoreboard a little better

Jeff Smith writes: This blank space is for you to explain what you mean by "a little better". What makes the result better? It seems to do too many things in a single patch. For example, I guess it may be a good idea that you made various knobs like "show_root" encapsulated in the scoreboard;

Re: [RFC PATCH 02/10] Move textconv_object to be with other textconv methods

On Fri, May 5, 2017 at 10:44 AM, Junio C Hamano wrote: > Jeff Smith writes: > >> Signed-off-by: Jeff Smith >> --- >> builtin.h | 2 -- >> builtin/blame.c| 28 >> builtin/cat-file.c | 1 + >> diff.c | 23 +++ >> diff.h

Re: [PATCH] t7406: fix i18n expectation of error message

On Fri, May 5, 2017 at 7:38 PM, Stefan Beller wrote: > The error message from "submodule update" is internationalized, which > makes sense. The test however did not check for the translated version, > but used a hardcoded string, which breaks the test when run with > GETTEXT_POISON. > > Signed-off

Re: [RFC PATCH 02/10] Move textconv_object to be with other textconv methods

Jeff Smith writes: > Signed-off-by: Jeff Smith > --- > builtin.h | 2 -- > builtin/blame.c| 28 > builtin/cat-file.c | 1 + > diff.c | 23 +++ > diff.h | 7 +++ > 5 files changed, 31 insertions(+), 30 d

Re: [RFC PATCH 03/10] Add some missing definitions to header files

Jeff Smith writes: > Signed-off-by: Jeff Smith > --- > object.h| 2 ++ > pathspec.h | 4 > refs.h | 3 +++ > tree-walk.h | 2 ++ > 4 files changed, 11 insertions(+) As the coding rule of this codebase is not to include system headers in anything other than git-compat-util.h whic

[PATCH] t7406: fix i18n expectation of error message

The error message from "submodule update" is internationalized, which makes sense. The test however did not check for the translated version, but used a hardcoded string, which breaks the test when run with GETTEXT_POISON. Signed-off-by: Stefan Beller --- t/t7406-submodule-update.sh | 6 ++

Re: [PATCH 0/5] Start of a journey: drop NO_THE_INDEX_COMPATIBILITY_MACROS

On 05/05, Junio C Hamano wrote: > Jonathan Nieder writes: > > > That is, one way to do what this series attempts would be the > > following: > > > > 1. rename variables that shadow the_index. > > No question about this one. It is a good thing to do. > > > 2. add coccinelle patches (or one co

Re: [PATCH 0/5] Start of a journey: drop NO_THE_INDEX_COMPATIBILITY_MACROS

Jonathan Nieder writes: > That is, one way to do what this series attempts would be the > following: > > 1. rename variables that shadow the_index. No question about this one. It is a good thing to do. > 2. add coccinelle patches (or one coccinelle patch) to > contrib/coccinelle implemen

Re: [PATCH 0/5] Start of a journey: drop NO_THE_INDEX_COMPATIBILITY_MACROS

On 05/05, Johannes Schindelin wrote: > Hi Stefan & Junio, > > On Thu, 4 May 2017, Stefan Beller wrote: > > > So instead of a mechanical replacement, we'd rather want to > > see "the_index" not appearing at all outside of builtins, which > > implies two things: > > > > * If done properly we can mo

Re: [PATCH] l10n: de.po: translate 4 new messages

Acked-by: Matthias Rüster Am 05.05.2017 um 18:17 schrieb Ralf Thielow: > Translate 4 new messages came from git.pot update in 28e1aaa48 (l10n: > git.pot: v2.13.0 round 2 (4 new, 7 removed)). > > Signed-off-by: Ralf Thielow > --- > po/de.po | 9 - > 1 file changed, 4 insertions(+), 5 d

[PATCH] l10n: de.po: translate 4 new messages

Translate 4 new messages came from git.pot update in 28e1aaa48 (l10n: git.pot: v2.13.0 round 2 (4 new, 7 removed)). Signed-off-by: Ralf Thielow --- po/de.po | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/po/de.po b/po/de.po index 12c3d36a0..679f8f472 100644 --- a/po

Re: [PATCH v1 2/2] travis-ci: add job to run tests with GETTEXT_POISON

Hi, Lars Schneider wrote: > Add a job to run Git tests with GETTEXT_POISON. In this job we don't run > the git-p4, git-svn, and HTTPD tests to save resources/time (those tests > are already executed in other jobs). Since we don't run these tests, we > can also skip the "before_install" step (whic

[PATCH v1 0/2] run GETTEXT_POISON on TravisCI

Hi, this adds GETTEXT_POISON tests to TravisCI. Patch 1/2 is preparation and 2/2 adds the build job. You can see a test run here: https://travis-ci.org/larsxschneider/git/jobs/229120495 On "next" this generates a bunch of failures (see below). @Ævar: Are your GETTEXT_POISON fixes in already or

[PATCH v1 1/2] travis-ci: setup "prove cache" in "script" step

The command that made the "prove cache" persistent across builds was executed in the "before_install" step. Consequently, every job that wanted to make use of the cache had to run this step. The "prove cache" is only used in the "script" step for the "make test" command. Therefore, we should confi

[PATCH v1 2/2] travis-ci: add job to run tests with GETTEXT_POISON

Add a job to run Git tests with GETTEXT_POISON. In this job we don't run the git-p4, git-svn, and HTTPD tests to save resources/time (those tests are already executed in other jobs). Since we don't run these tests, we can also skip the "before_install" step (which would install the necessary depend

[PATCH v7 05/10] convert: split start_multi_file_filter() into two separate functions

To enable future reuse of the filter..process infrastructure, split start_multi_file_filter() into two separate parts. start_multi_file_filter() will now only contain the generic logic to manage the creation and tracking of the child process in a hashmap. start_multi_file_filter_fn() is a protoco

[PATCH v7 02/10] pkt-line: fix packet_read_line() to handle len < 0 errors

Update packet_read_line() to test for len > 0 to avoid potential bug if read functions return lengths less than zero to indicate errors. Signed-off-by: Ben Peart Found/Fixed-by: Lars Schneider --- pkt-line.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkt-line.c b/pkt-li

[PATCH v7 10/10] convert: Update subprocess_read_status to not die on EOF

Enable sub-processes to gracefully handle when the process dies by updating subprocess_read_status to return an error on EOF instead of dying. Update apply_multi_file_filter to take advantage of the revised subprocess_read_status. Signed-off-by: Ben Peart --- convert.c | 10 -- sub-

[PATCH v7 04/10] convert: move packet_write_line() into pkt-line as packet_writel()

Add packet_writel() which writes multiple lines in a single call and then calls packet_flush_gently(). Update convert.c to use the new packet_writel() function from pkt-line. Signed-off-by: Ben Peart --- convert.c | 23 ++- pkt-line.c | 19 +++ pkt-line.h |

[PATCH v7 08/10] convert: rename reusable sub-process functions

Do a mechanical rename of the functions that will become the reusable sub-process module. Signed-off-by: Ben Peart --- convert.c | 40 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/convert.c b/convert.c index 7d05dcb4aa..84c4ff8a01 10064

[PATCH v7 01/10] convert: remove erroneous tests for errno == EPIPE

start_multi_file_filter() and apply_multi_file_filter() currently test for errno == EPIPE but treating EPIPE as an error is already happening from one of the packet_write() functions. Signed-off-by: Ben Peart Found/Fixed-by: Jeff King Acked-by: Lars Schneider --- convert.c | 4 ++-- 1 file cha

[PATCH v7 06/10] convert: Separate generic structures and variables from the filter specific ones

To enable future reuse of the filter..process infrastructure, split the cmd2process structure into two separate parts. subprocess_entry will now contain the generic data required to manage the creation and tracking of the child process in a hashmap. cmd2process is a filter protocol specific struc

[PATCH v7 07/10] convert: Update generic functions to only use generic data structures

Update all functions that are going to be moved into a reusable module so that they only work with the reusable data structures. Move code that is specific to the filter out into the filter specific functions. Signed-off-by: Ben Peart --- convert.c | 41 +++--

[PATCH v7 09/10] sub-process: move sub-process functions into separate files

Move the sub-proces functions into sub-process.h/c. Add documentation for the new module in Documentation/technical/api-sub-process.txt Signed-off-by: Ben Peart --- Documentation/technical/api-sub-process.txt | 59 Makefile| 1 + convert.c

[PATCH v7 03/10] pkt-line: add packet_read_line_gently()

Add packet_read_line_gently() to enable reading a line without dying on EOF. Signed-off-by: Ben Peart --- pkt-line.c | 12 pkt-line.h | 11 +++ 2 files changed, 23 insertions(+) diff --git a/pkt-line.c b/pkt-line.c index 6f05b1a4a8..7db9119573 100644 --- a/pkt-line.c +++ b/

[PATCH v7 00/10] refactor the filter process code into a reusable module

Changes from V6 include: convert: remove erroneous tests for errno == EPIPE - split into separate patch to fix a preexisting bug discovered in the review process pkt-line: Update packet_read_line() to test for len > 0 - split into separate patch to deal with errors that return negative lengths

Re: not uptodate. Cannot merge

On 2017-05-04 23:40, G. Sylvie Davies wrote: > Hi, > > My little bitbucket "cherry-pick" button is failing on Windows from a > "git reset --hard" blowing up. > > My situation: Git-2.10.2.windows.1 / Bitbucket-4.14.3 / Windows > 10-10.0-amd64. But I suspect even more recent Git will have the sa

Re: not uptodate. Cannot merge

Hi Sylvie, On Thu, 4 May 2017, G. Sylvie Davies wrote: > My situation: Git-2.10.2.windows.1 / Bitbucket-4.14.3 / Windows > 10-10.0-amd64. But I suspect even more recent Git will have the same > problem. In contrast, I suspect that recent Git for Windows versions have tons of CR/LF-related fix

[PATCH 1/2] split-index: add and use unshare_split_index()

From: Nguyễn Thái Ngọc Duy When split-index is being used, we have two cache_entry arrays in index_state->cache[] and index_state->split_index->base->cache[]. index_state->cache[] may share the same entries with base->cache[] so we can quickly determine what entries are shared. This makes memory

[PATCH 0/2] split index extra bits

This patch series contains 2 patches that have already been sent to the list but have felt through the cracks. It would be nice if they could be considered for v2.13.0. Patch 1/2 (split-index: add and use unshare_split_index()) by Duy fixes a memory leak when a new shared index file is created and

[PATCH 2/2] p3400: add perf tests for rebasing many changes

Rebasing onto many changes is interesting, but it's also interesting to see what happens when rebasing many changes. And while at it, let's also look at the impact of using a split index. Signed-off-by: Christian Couder --- t/perf/p3400-rebase.sh | 22 +- 1 file changed, 21

Re: [PATCH 0/5] Start of a journey: drop NO_THE_INDEX_COMPATIBILITY_MACROS

Hi Stefan & Junio, On Thu, 4 May 2017, Stefan Beller wrote: > So instead of a mechanical replacement, we'd rather want to > see "the_index" not appearing at all outside of builtins, which > implies two things: > > * If done properly we can move the macros from cache.h to > e.g. builtin.h. That

Re: How to `git status' without scrambling modified with new, etc

On Fri, May 5, 2017 at 4:02 PM, Harry Putnam wrote: > This is probably what everyone sees: > > When I run `git status'; I see modified and newfiles scrambled together > > Is there a trick or technique to make that output show each category > separately? > > Or do folks just a throw a `sort' in th

Re: [RFC PATCH 01/10] Remove unneeded dependency on blob.h from blame

While it was added there (it was part of builtin pickaxe which was renamed builtin blame), it was actually needed then, but I do see what you are getting at. It was no longer needed in commit 21666f1 ("convert object type handling from a string to a number", 2007-02-26) with the removed use of blo

How to `git status' without scrambling modified with new, etc

This is probably what everyone sees: When I run `git status'; I see modified and newfiles scrambled together Is there a trick or technique to make that output show each category separately? Or do folks just a throw a `sort' in there (git status|sort) and lose the color ouput?

git client debug with customer ssh client

Hi, Git client has been ported to HPE NonStop. This OS is Posix called OSS. Currently this git client works with openSSH ssh client also ported to OSS. When we try to use our "native" ssh client, a custom written ssh client, using GIT_SSH= to point to it we are running into some problems

Re: git error

Hi Ada, On Fri, 5 May 2017, ada wrote: > I used the command below,there's an error,please help me to solve it ! > Thank you ~ > git push I am sorry to hear that you encountered a problem using Git. Having said that, this description does not allow anybody to help you, as not even the error mess

Re: git error

On Fri, May 05, 2017 at 10:52:13AM +0800, ada wrote: > hi, > > I used the command below,there's an error,please help me to solve it ! > Thank you ~ > git push > > > Best Regards~ > ada Wang > Hello Ada, In order for people to be able to help you, you should provide more details about your pro

[PATCH] doc: replace a couple of broken gmane links

Replace a couple of broken links to gmane with links to other archives. See commit 54471fdcc3 ("README: replace gmane link with public-inbox", 2016-12-15) for prior art. With this change there's still 4 references left in the code: $ git grep -E '(article|thread)\.gmane.org' -- |grep -v RelNo

Re: [RFC PATCH 01/10] Remove unneeded dependency on blob.h from blame

For commit message: This was originally added in commit acca687fa9 ("git-pickaxe: retire pickaxe", 2006-11-08), but has never been needed. On Fri, May 5, 2017 at 7:27 AM, Jeff Smith wrote: > Signed-off-by: Jeff Smith > --- > builtin/blame.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git