[PATCH] sequencer: improve config handling

From: Phillip Wood The previous config handling relied on global variables, called git_default_config() even when the key had already been handled by git_sequencer_config() and did not initialize the diff configuration variables. Improve this by: i) loading the

[PATCH 2/8] perf/aggregate: refactor printing results

Signed-off-by: Christian Couder --- t/perf/aggregate.perl | 96 +++ 1 file changed, 50 insertions(+), 46 deletions(-) diff --git a/t/perf/aggregate.perl b/t/perf/aggregate.perl index 769d418708..3609cb5dc3 100755 ---

[PATCH 1/8] perf/aggregate: fix checking ENV{GIT_PERF_SUBSECTION}

Signed-off-by: Christian Couder --- t/perf/aggregate.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/perf/aggregate.perl b/t/perf/aggregate.perl index e401208488..769d418708 100755 --- a/t/perf/aggregate.perl +++ b/t/perf/aggregate.perl @@

[PATCH 3/8] perf/aggregate: implement codespeed JSON output

Codespeed (https://github.com/tobami/codespeed/) is an open source project that can be used to track how some software performs over time. It stores performance test results in a database and can show nice graphs and charts on a web interface. As it can be interesting to Codespeed to see how Git

[PATCH 6/8] perf/run: learn about perf.codespeedOutput

Signed-off-by: Christian Couder --- t/perf/run | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/t/perf/run b/t/perf/run index 04ea5090f9..4454a2713d 100755 --- a/t/perf/run +++ b/t/perf/run @@ -144,10 +144,15 @@ run_subsection () {

[PATCH 5/8] perf/run: add conf_opts argument to get_var_from_env_or_config()

Signed-off-by: Christian Couder --- t/perf/run | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/t/perf/run b/t/perf/run index bbd703dc4f..04ea5090f9 100755 --- a/t/perf/run +++ b/t/perf/run @@ -106,6 +106,7 @@ get_var_from_env_or_config () {

[PATCH 4/8] perf/run: use $default_value instead of $4

Signed-off-by: Christian Couder --- t/perf/run | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/perf/run b/t/perf/run index 43e4de49ef..bbd703dc4f 100755 --- a/t/perf/run +++ b/t/perf/run @@ -105,7 +105,7 @@ get_var_from_env_or_config () {

[PATCH 7/8] perf/run: learn to send output to codespeed server

Signed-off-by: Christian Couder --- t/perf/run | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/t/perf/run b/t/perf/run index 4454a2713d..7b7011f19b 100755 --- a/t/perf/run +++ b/t/perf/run @@ -148,10 +148,20 @@ run_subsection () {

[PATCH 8/8] perf/run: read GIT_TEST_REPO_NAME from perf.repoName

Signed-off-by: Christian Couder --- t/perf/run | 3 +++ 1 file changed, 3 insertions(+) diff --git a/t/perf/run b/t/perf/run index 7b7011f19b..279c2d41f6 100755 --- a/t/perf/run +++ b/t/perf/run @@ -137,6 +137,9 @@ run_subsection () { get_var_from_env_or_config

Re: [PATCH v4 00/34] Add directory rename detection to git

On Tue, Dec 12, 2017 at 6:01 PM, Junio C Hamano wrote: > OK, it seems that I managed to make this test pass under poison build > (see https://travis-ci.org/git/git/jobs/315658242) > > Please check > https://github.com/git/git/commit/e5c5e24ad91a75b5a70c056fe6c6e3bfb55b56fc >

Re: [PATCH 3/3] travis: run tests with GIT_TEST_SPLIT_INDEX

On 12/13, Lars Schneider wrote: > > > On 13 Dec 2017, at 18:38, Junio C Hamano wrote: > > > > Lars Schneider writes: > > > >> I think your solution points into the right direction. > >> Right now we have the following test matrix: > >> > >> 1.

Re: [PATCH 1/4] travis-ci: use 'set -x' in 'ci/*' scripts for extra tracing output

> On 12 Dec 2017, at 19:43, SZEDER Gábor wrote: > > On Tue, Dec 12, 2017 at 7:00 PM, Lars Schneider > wrote: >> >>> On 12 Dec 2017, at 00:34, SZEDER Gábor wrote: >>> >>> While the build logic was embedded in our

Re: Apparent bug in 'git stash push ' loses untracked files

On 12/13, Igor Djordjevic wrote: > Hi Reid, > > On 13/12/2017 18:32, Reid Price wrote: > > > > When running 'git stash push ' if there are both tracked and > > untracked files in this subdirectory, the tracked files are stashed > > but the untracked files are discarded. > > I can reproduce this

[PATCH] RelNotes: minor typo fixes in 2.16.0 draft

Signed-off-by: Todd Zullinger --- Documentation/RelNotes/2.16.0.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/RelNotes/2.16.0.txt b/Documentation/RelNotes/2.16.0.txt index 3eeeb83674..f7fca7123f 100644 ---

Re: [PATCH 3/3] travis: run tests with GIT_TEST_SPLIT_INDEX

On 12/12, Junio C Hamano wrote: > Thomas Gummerer writes: > > > > > The breakages wen the split-index code fails tend to break things in > > much more obvious manners than a wrong message, usually git ends up > > dying if it gets broken. Both of the bugs that were fixed

Re: Apparent bug in 'git stash push ' loses untracked files

Hi Thomas, On 14/12/2017 00:14, Thomas Gummerer wrote: > > > For what it`s worth, using `git stash save ` instead seems > > to (still) work as expected... > > I think that depends on what you expect ;) 'git stash save ' > will create a stash of the whole working directory with the message >

[PATCH] git-svn: convert CRLF to LF in commit message to SVN

"Bennett, Brian" wrote: > Environment: > > Desktop: Windows 7 Enterprise 64-bit > svn client (if applicable): 1.8.8 from Apache > git (https://git-for-windows.github.io/): git version 2.10.1.windows.1 > GitTfs (https://github.com/git-tfs/git-tfs): git-tfs version

Re: [WIP 12/15] ls-refs: introduce ls-refs server command

From: "Brandon Williams" Sent: Monday, December 04, 2017 11:58 PM Introduce the ls-refs server command. In protocol v2, the ls-refs command is used to request the ref advertisement from the server. Since it is a command which can be requested (as opposed to manditory in

Re: feature-request: git "cp" like there is git mv.

Hi Simon, On Tue, 12 Dec 2017, Simon Doodkin wrote: > please develop a new feature, git "cp" like there is git mv tomovefile1 > tofile2 (to save space). > > there is a solution in https://stackoverflow.com/a/44036771/466363 > however, it is not single easy command. This is not how this project

Greetings MY Dearest In The Lord

Greetings MY Dearest In The Lord Please I know this may come to you by surprise ,because you do not know me, I need your assistance that is why I am writing you, it is my desire of going into relationship with you. I am Mrs. Alla Babayeve i am a Farmer/gold and diamond dealer I am a merchant

RE: feature-request: git "cp" like there is git mv.

-Original Message- On December 13, 2017 11:40 AM Johannes Schindelin wrote: >On Tue, 12 Dec 2017, Simon Doodkin wrote: >> please develop a new feature, git "cp" like there is git mv >> tomovefile1 tofile2 (to save space). >> there is a solution in

Re: [PATCH 3/3] travis: run tests with GIT_TEST_SPLIT_INDEX

> On 12 Dec 2017, at 20:15, Junio C Hamano wrote: > > Lars Schneider writes: > >>> You're right, it's my first time using travis CI and I got confused >>> about how the .travis.yml works, thanks for catching that. Will >>> re-phrase the commit

Re: [PATCH 3/3] travis: run tests with GIT_TEST_SPLIT_INDEX

> On 13 Dec 2017, at 18:38, Junio C Hamano wrote: > > Lars Schneider writes: > >> I think your solution points into the right direction. >> Right now we have the following test matrix: >> >> 1. Linux - clang >> 2. Linux - gcc >> 3. Mac - clang >>

Apparent bug in 'git stash push ' loses untracked files

When running 'git stash push ' if there are both tracked and untracked files in this subdirectory, the tracked files are stashed but the untracked files are discarded. I can reproduce this on my system (OSX, git 2.14.1) by running the below script as bash -x ./stashbug.sh &> output.txt I

Re: [PATCH] doc: Modify git-add doc to say "staging area"

Jacob Keller writes: > I know we've used various terms for this concept across a lot of the > documentation. However, I was under the impression that we most > explicitly used "index" rather than "staging area". > > Additionally, I think there are many other locations

Re: [PATCH 0/8] Codespeed perf results

From: "Christian Couder" This patch series is built on top of cc/perf-run-config which recently graduated to master. It makes it possible to send perf results to a Codespeed server. See https://github.com/tobami/codespeed/ and web sites like http://speed.pypy.org/

Re: [PATCH 0/8] Codespeed perf results

On Wed, Dec 13, 2017 at 5:02 PM, Philip Oakley wrote: >> The end goal would be to have such a server always available to track >> how the different git commands perform over time on different kind of >> repos (small, medium, large, ...) with different optimizations on and

Re: [PATCH 3/3] travis: run tests with GIT_TEST_SPLIT_INDEX

Lars Schneider writes: > I think your solution points into the right direction. > Right now we have the following test matrix: > > 1. Linux - clang > 2. Linux - gcc > 3. Mac - clang > 4. Mac - gcc > 5. Linux - gcc - GET_TEXT_POISION > 6. Linux - gcc - 32bit > 7. Windows

Re: What's cooking in git.git (Dec 2017, #02; Thu, 7)

On 12/12/2017 4:30 AM, Christian Couder wrote: On Thu, Dec 7, 2017 at 7:04 PM, Junio C Hamano wrote: * jh/object-filtering (2017-12-05) 9 commits (merged to 'next' on 2017-12-05 at 3a56b51085) + rev-list: support --no-filter argument + list-objects-filter-options:

Re: [PATCH v1] convert: add support for 'encoding' attribute

Lars Schneider writes: > ... In a perfect world I think I would store > the encoding of a file in the tree object. I didn't pursue that solution > as this would change the Git data model which would open a can of worms > for a problem that not that many people have

Re: [PATCH v4 00/34] Add directory rename detection to git

On 13/12/17 01:06, Junio C Hamano wrote: > Elijah Newren writes: > >> This patchset introduces directory rename detection to merge-recursive. > > The use of negated form of test_i18ngrep in these patches are all > wrong. Because the helper must say "even though the string

Re: [PATCH 3/8] perf/aggregate: implement codespeed JSON output

On Wed, Dec 13, 2017 at 10:13 AM, Christian Couder wrote: > Codespeed (https://github.com/tobami/codespeed/) is an open source > project that can be used to track how some software performs over > time. It stores performance test results in a database and can show >

Re: [PATCH] doc: Modify git-add doc to say "staging area"

On Wed, Dec 13, 2017 at 6:46 AM, David A. Wheeler wrote: > On December 13, 2017 12:40:12 AM EST, Jacob Keller > wrote: >>I know we've used various terms for this concept across a lot of the >>documentation. However, I was under the impression that

[PATCH 0/8] Codespeed perf results

This patch series is built on top of cc/perf-run-config which recently graduated to master. It makes it possible to send perf results to a Codespeed server. See https://github.com/tobami/codespeed/ and web sites like http://speed.pypy.org/ which are using Codespeed. The end goal would be to have

[PATCH] path: document path functions

Signed-off-by: Brandon Williams --- As promised here is an update to the documentation for the path generating functions. path.h | 133 ++--- 1 file changed, 112 insertions(+), 21 deletions(-) diff --git a/path.h

Re: [PATCH v4 00/34] Add directory rename detection to git

Ramsay Jones writes: > On 13/12/17 01:06, Junio C Hamano wrote: > >> We may probably want to redirect the output of underlying grep to >> /dev/null in test_i18ngrep to make this kind of misuse easier to >> spot. > > I have test-suite failures on the 'pu' branch for

Re: [PATCH] path: document path functions

Brandon Williams writes: > Signed-off-by: Brandon Williams > --- > > As promised here is an update to the documentation for the path generating > functions. > > path.h | 133 > ++--- > 1 file

From Mr. Chow

Good day I emailed you earlier without any response from you, in my first email I mentioned about my late client, whose relatives I cannot get in touch with. He deposited a large sum of funds in our bank. I am in a position to front you as the next of kin to late client and move funds to you

[PATCH] t/helper: ignore everything but sources

Compiled test helpers in t/helper are out of sync with the .gitignore files quite frequently. This can happen when new test helpers are added, but the explicit .gitignore file is not updated in the same commit, or when you forget to 'make clean' before checking out a different version of git, as

Re: [PATCH 4/8] perf/run: use $default_value instead of $4

Christian Couder writes: > Signed-off-by: Christian Couder > --- > t/perf/run | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/t/perf/run b/t/perf/run > index 43e4de49ef..bbd703dc4f 100755 > --- a/t/perf/run > +++

Re: [PATCH v1] convert: add support for 'encoding' attribute

> On 12 Dec 2017, at 20:31, Junio C Hamano wrote: > > Lars Schneider writes: > >> Our favorite is "treat-encoding-as". Do you consider this better >> or worse than "checkout-encoding"? > > I am afraid that "treat as" is not sufficiently specific

Re: [PATCH v6 3/3] rev-list: support --no-filter argument

On 12/11/2017 1:17 AM, Christian Couder wrote: On Tue, Dec 5, 2017 at 5:50 PM, Jeff Hostetler wrote: From: Jeff Hostetler Teach rev-list to support --no-filter to override a previous --filter= argument. This is to be consistent with commands

Re: [PATCH] doc: Modify git-add doc to say "staging area"

On Wed, 13 Dec 2017 09:02:42 -0800, Junio C Hamano wrote: > .. But that is not the only thing the index does. When "git merge" > finds conflicting changes, it adds the contents for common, our and > their variants to the index for the path. This is quite different > from how

Re: [PATCH 4/8] perf/run: use $default_value instead of $4

Junio C Hamano writes: > If you want to be able to use this helper to specify a default value > of an empty string (which the orignal that used $4 did), then the > previous hunk must be corrected so that it does not unconditionally > set default_value to $4. Perhaps like > >

Re: Apparent bug in 'git stash push ' loses untracked files

Hi Reid, On 13/12/2017 18:32, Reid Price wrote: > > When running 'git stash push ' if there are both tracked and > untracked files in this subdirectory, the tracked files are stashed > but the untracked files are discarded. I can reproduce this as well (git version 2.15.1.windows.2). For what

Re: [PATCH] doc: clarify usage of XDG_CONFIG_HOME config file

Yaroslav Halchenko writes: > It always read it for non--global > ... > and it doesn't read it for --global > ... > unless ~/.gitconfig is missing Yes, this dates back to 21cf3227 ("config: read (but not write) from $XDG_CONFIG_HOME/git/config file", 2012-06-22), around the

Re: [PATCH 3/8] perf/aggregate: implement codespeed JSON output

Christian Couder writes: > my $resultsdir = "test-results"; > +my $results_section = ""; > if (exists $ENV{GIT_PERF_SUBSECTION} and $ENV{GIT_PERF_SUBSECTION} ne "") { > $resultsdir .= "/" . $ENV{GIT_PERF_SUBSECTION}; > + $results_section =

Re: [PATCH] partial-clone: design doc

From: "Junio C Hamano" "Philip Oakley" writes: + These filtered packfiles are incomplete in the traditional sense because + they may contain trees that reference blobs that the client does not have. Is a comment needed here noting that currently,

Re: [PATCH] doc: clarify usage of XDG_CONFIG_HOME config file

On Tue, 12 Dec 2017, Jacob Keller wrote: > > And then "and the other files will not be read" can be dropped from > > the first sentence of this paragraph? > > Yaroslav on the original thread mentioned that reading codepath > > without --file or --global does not limit to one of the three, and >

Re: [PATCH] partial-clone: design doc

On 12/8/2017 3:14 PM, Junio C Hamano wrote: Jeff Hostetler writes: From: Jeff Hostetler First draft of design document for partial clone feature. Signed-off-by: Jeff Hostetler Signed-off-by: Jonathan Tan

What's cooking in git.git (Dec 2017, #03; Wed, 13)

Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. You can find the changes

Re: [PATCH v1] convert: add support for 'encoding' attribute

> On 13 Dec 2017, at 19:11, Junio C Hamano wrote: > > Lars Schneider writes: > >> ... In a perfect world I think I would store >> the encoding of a file in the tree object. I didn't pursue that solution >> as this would change the Git data model

Re: Apparent bug in 'git stash push ' loses untracked files

Hi, On 12/13, Reid Price wrote: > When running 'git stash push ' if there are both tracked and > untracked files in this subdirectory, the tracked files are stashed > but the untracked files are discarded. > > I can reproduce this on my system (OSX, git 2.14.1) by running the > below script as >