Re: [PATCH v2 10/14] commit-graph: add core.commitgraph setting

> The commit graph feature is controlled by the new core.commitgraph config > setting. This defaults to 0, so the feature is opt-in. > > The intention of core.commitgraph is that a user can always stop checking > for or parsing commit graph files if core.commitgraph=0. > > Signed-off-by: Derrick

Re: [PATCH v2 04/14] commit-graph: implement construct_commit_graph()

> Teach Git to write a commit graph file by checking all packed objects > to see if they are commits, then store the file in the given pack > directory. I'm afraid that scanning all packed objects is a bit of a roundabout way to approach this. In my git repo, with 9 pack files at the moment,

Re: [PATCH v2 09/14] commit-graph: teach git-commit-graph --delete-expired

> Teach git-commit-graph to delete the graph previously referenced by > 'graph_head' > when writing a new graph file and updating 'graph_head'. This prevents > data creep by storing a list of useless graphs. Be careful to not delete > the graph if the file did not change. We have to be careful

Re: [PATCH] cocci: simplify check for trivial format strings

On Thu, Feb 1, 2018 at 7:56 PM, René Scharfe wrote: > 353d84c537 (coccicheck: make transformation for strbuf_addf(sb, "...") > more precise) added a check to avoid transforming calls with format > strings which contain percent signs, as that would change the result. > It uses

Re: [PATCH v2 08/14] commit-graph: implement git-commit-graph --clear

> Teach Git to delete the current 'graph_head' file and the commit graph > it references. And will it leave other, non-important graph files behind? Looking at the code it indeed does. What is the use case for keeping the non-important graph files? > This is a good safety valve if somehow the

Re: [PATCH v2 07/14] commit-graph: implement git-commit-graph --update-head

> diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh > index da565624e3..d1a23bcdaf 100755 > --- a/t/t5318-commit-graph.sh > +++ b/t/t5318-commit-graph.sh > @@ -107,6 +112,9 @@ test_expect_success 'setup bare repo' \ > test_expect_success 'write graph in bare repo' \ >

Re: [PATCH v2 05/14] commit-graph: implement git-commit-graph --write

> diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh > new file mode 100755 > index 00..6bcd1cc264 > --- /dev/null > +++ b/t/t5318-commit-graph.sh > @@ -0,0 +1,96 @@ > +#!/bin/sh > + > +test_description='commit graph' > +. ./test-lib.sh > + > +test_expect_success 'setup full

Re: [PATCH v2 07/14] commit-graph: implement git-commit-graph --update-head

> It is possible to have multiple commit graph files in a pack directory, > but only one is important at a time. Use a 'graph_head' file to point > to the important file. This implies that all those other files are ignored, right? > Teach git-commit-graph to write 'graph_head' upon > writing a

Re: [PATCH v2 03/14] commit-graph: create git-commit-graph builtin

> diff --git a/Documentation/git-commit-graph.txt > b/Documentation/git-commit-graph.txt > new file mode 100644 > index 00..c8ea548dfb > --- /dev/null > +++ b/Documentation/git-commit-graph.txt > @@ -0,0 +1,7 @@ > +git-commit-graph(1) > + Here the length of the '' must

Re: [PATCH v2 06/14] commit-graph: implement git-commit-graph --read

> Teach git-commit-graph to read commit graph files and summarize their > contents. > > Use the --read option to verify the contents of a commit graph file in the > tests. > > Signed-off-by: Derrick Stolee > --- > Documentation/git-commit-graph.txt | 7 ++ >

Re: [PATCH v2 05/14] commit-graph: implement git-commit-graph --write

> Teach git-commit-graph to write graph files. Create new test script to verify > this command succeeds without failure. > > Signed-off-by: Derrick Stolee > --- > Documentation/git-commit-graph.txt | 18 +++ > builtin/commit-graph.c | 30 >

Re: [PATCH v2 04/14] commit-graph: implement construct_commit_graph()

> Teach Git to write a commit graph file by checking all packed objects > to see if they are commits, then store the file in the given pack > directory. > > Signed-off-by: Derrick Stolee > --- > Makefile | 1 + > commit-graph.c | 376 >

[PATCHv2 2/5] travis-ci: use 'set -e' in the 32 bit Linux build job

line in the 'su' command block anyway, change their indentation to use a tab instead of spaces. Signed-off-by: SZEDER Gábor <szeder@gmail.com> --- ci/run-linux32-build.sh | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ci/run-linux32-build.s

[PATCHv2 4/5] travis-ci: don't run the test suite as root in the 32 bit Linux build

job failures. To resolve this we should manually delete caches containing such root-owned files, but that would be a hassle. Instead, work this around by changing the owner of the whole contents of the cache directory to the host user ID. Signed-off-by: SZEDER Gábor <szeder@gmail.

[PATCHv2 0/5] Travis CI: don't run the test suite as root in the 32 bit Linux build

ot;' and add debug message in patch 5. Additionally, it's rebased onto current master (I branched off v1 from 'sg/travis-build-during-script-phase' to avoid a conflict, but Junio applied it on top of current master). Interdiff against 'sg/travis-linux32-sanity' at the end. SZEDER Gábor (5): t

[PATCHv2 5/5] travis-ci: don't fail if user already exists on 32 bit Linux build job

in the container, so developers don't have to bother with running a 'userdel' each time before they run the build script. The build job on Travis CI always starts with a fresh Docker container, so this change doesn't make a difference there. Signed-off-by: SZEDER Gábor <szeder@gmail.com> -

[PATCHv2 3/5] travis-ci: don't repeat the path of the cache directory

. Signed-off-by: SZEDER Gábor <szeder@gmail.com> --- ci/lib-travisci.sh | 7 --- ci/run-linux32-build.sh | 2 +- ci/run-linux32-docker.sh | 5 - ci/run-tests.sh | 3 ++- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ci/lib-travisci.sh b/ci/lib-travi

[PATCHv2 1/5] travis-ci: use 'set -x' for the commands under 'su' in the 32 bit Linux build

Signed-off-by: SZEDER Gábor <szeder@gmail.com> --- ci/run-linux32-build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/run-linux32-build.sh b/ci/run-linux32-build.sh index c19c50c1c..5a36a8d7c 100755 --- a/ci/run-linux32-build.sh +++ b/ci/run-linux32-build.sh @@ -26,6 +26,7 @

"git fast-import" crashes parsing output from "fossil export --git"

> "git fast-import" fails while trying to import the latest "Fossil" > fossil-sources (it dog-foods its own source-code). Namely, the below > pasted commands caused the crash report below them (I've trimmed > irrelevant noise from the report for brevity). One of the tests > included in Fossil uses

Re: [RFC PATCH 0/2] alternate hash test

> This series wires up an alternate hash implementation, namely > BLAKE2b-160. The goal is to allow us to identify tests which rely on > the hash algorithm in use so that we can fix those tests. > t9903-bash-prompt.sh (Wstat: 256 Tests: 66 > Failed: 53) > Failed

Re: [PATCH 10/10] t: make 'test_i18ngrep' more informative on failure

On Fri, Jan 26, 2018 at 8:25 PM, Jeff King <p...@peff.net> wrote: > On Fri, Jan 26, 2018 at 08:23:24PM +0100, SZEDER Gábor wrote: > >> On Fri, Jan 26, 2018 at 7:50 PM, Jeff King <p...@peff.net> wrote: >> > You can also use "-x" to get a better

Re: [PATCH 10/10] t: make 'test_i18ngrep' more informative on failure

On Fri, Jan 26, 2018 at 7:50 PM, Jeff King <p...@peff.net> wrote: > On Fri, Jan 26, 2018 at 01:37:08PM +0100, SZEDER Gábor wrote: > >> When 'test_i18ngrep' can't find the expected pattern, it exits >> completely silently; when its negated form does find the p

Re: [PATCH 05/10] t5510: consolidate 'grep' and 'test_i18ngrep' patterns

On Fri, Jan 26, 2018 at 7:16 PM, Junio C Hamano <gits...@pobox.com> wrote: > SZEDER Gábor <szeder@gmail.com> writes: > >> One of the tests in 't5510-fetch.sh' checks the output of 'git fetch' >> using 'test_i18ngrep', and while doing so it prefilters the outpu

Re: [PATCH 07/10] t: move 'test_i18ncmp' and 'test_i18ngrep' to 'test-lib-functions.sh'

On Fri, Jan 26, 2018 at 7:19 PM, Junio C Hamano <gits...@pobox.com> wrote: > SZEDER Gábor <szeder@gmail.com> writes: > >> Both 'test_i18ncmp' and 'test_i18ngrep' helper functions are supposed >> to be called from our test scripts, so they should be in >> '

Re: [PATCH 08/10] t: forbid piping into 'test_i18ngrep'

On Fri, Jan 26, 2018 at 7:24 PM, Junio C Hamano <gits...@pobox.com> wrote: > SZEDER Gábor <szeder@gmail.com> writes: > >> See two of the previous patches for the only such cases we had in our >> test suite. However, reliably preventing this antipattern is a

[PATCH 03/10] t6022: don't run 'git merge' upstream of a pipe

a potential failure of the former. Signed-off-by: SZEDER Gábor <szeder@gmail.com> --- t/t6022-merge-rename.sh | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh index 05ebba7af..c01f721f1 100755 --- a/t/t6022-merge-ren

[PATCH 02/10] t5812: add 'test_i18ngrep's missing filename parameter

the two patterns into a single extended regexp, eliminating the need for an ||-chained second 'test_i18ngrep' invocation. Signed-off-by: SZEDER Gábor <szeder@gmail.com> --- t/t5812-proto-disable-http.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/t/t5812-proto-d

[PATCH 00/10] 'test_i18ngrep'-related fixes and improvements

When 'test_i18ngrep' can't find the expected pattern, it exits completely silently; when its negated form does find the pattern that shouldn't be there, it prints the matching line(s) but otherwise exits without any error message. This leaves the developer puzzled about what could have gone

[PATCH 09/10] t: make sure that 'test_i18ngrep' got enough parameters

, considering that patters can start with dashes as well, and in the majority of the cases we don't use any such options anyway. Signed-off-by: SZEDER Gábor <szeder@gmail.com> --- About that third one in 'pu': it's test '3b-check: Avoid implicit rename if involved as source on current side' intr

[PATCH 06/10] t5536: let 'test_i18ngrep' read the file without redirection

Redirecting 'test_i18ngrep's standard input from a file will interfere with the linting that will be added in a later patch. Signed-off-by: SZEDER Gábor <szeder@gmail.com> --- t/t5536-fetch-conflicts.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t5536

[PATCH 08/10] t: forbid piping into 'test_i18ngrep'

n our test suite. However, reliably preventing this antipattern is arguably more important than supporting these cases, which can be worked around by only minor inconveniences. Signed-off-by: SZEDER Gábor <szeder@gmail.com> --- t/test-lib-functions.sh | 4 1 file changed, 4 insertion

[PATCH 04/10] t4001: don't run 'git status' upstream of a pipe

between 'git status' and 'test_i18ngrep' to catch a potential failure of the former. Signed-off-by: SZEDER Gábor <szeder@gmail.com> --- t/t4001-diff-rename.sh | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh

[PATCH 10/10] t: make 'test_i18ngrep' more informative on failure

there must be a file parameter. Signed-off-by: SZEDER Gábor <szeder@gmail.com> --- t/test-lib-functions.sh | 25 + 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index b543fd0e0..1f1d89d7a 100644

[PATCH 01/10] t5541: add 'test_i18ngrep's missing filename parameter

that the given pattern is not present in its input, and of course it won't find that pattern if its input is empty, (as it comes from /dev/null). This also means that this test could miss a potential breakage of 'git push --no-progress'. Signed-off-by: SZEDER Gábor <szeder@gmail.com>

[PATCH 05/10] t5510: consolidate 'grep' and 'test_i18ngrep' patterns

by itself. Furthermore, piping data into 'test_i18ngrep' will interfere with the linting that will be added in a later patch. Signed-off-by: SZEDER Gábor <szeder@gmail.com> --- t/t5510-fetch.sh | 9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/t/t5510-fetch.sh b/t

[PATCH 07/10] t: move 'test_i18ncmp' and 'test_i18ngrep' to 'test-lib-functions.sh'

Both 'test_i18ncmp' and 'test_i18ngrep' helper functions are supposed to be called from our test scripts, so they should be in 'test-lib-functions.sh'. Signed-off-by: SZEDER Gábor <szeder@gmail.com> --- t/test-lib-functions.sh | 26 ++ t/test-lib.sh

Re: [PATCHv6 03/31] directory rename detection: testcases to avoid taking detection too far

On Fri, Jan 5, 2018 at 9:26 PM, Elijah Newren wrote: > Signed-off-by: Elijah Newren > --- > t/t6043-merge-rename-directories.sh | 153 > > 1 file changed, 153 insertions(+) > > diff --git

Re: Feature request: Improve diff algorithm

On Thu, Jan 25, 2018 at 9:12 PM, SZEDER Gábor <szeder@gmail.com> wrote: >> One yet more: >> >> @@ -141,5 +86,9 @@ >> // } >> >> >> - OP* o; Oops, when trying to reproduce I overlooked that here the * is stuck after OP ... >> +

Re: Feature request: Improve diff algorithm

> One yet more: > > @@ -141,5 +86,9 @@ > // } > > > - OP* o; > + SV *tvs = newSVpvs( "ScalarHistory" ); > + SV *tva = newSVpvs( "ArrayHistory" ); > + SV *tvh = newSVpvs( "HashHistory" ); > + > + OP *o; > while( PL_op ) { What version of Git are you

Re: [PATCH 5/5] travis-ci: don't fail if user already exists on 32 bit Linux build job

On Tue, Jan 23, 2018 at 5:46 PM, Jeff King <p...@peff.net> wrote: > On Mon, Jan 22, 2018 at 02:32:20PM +0100, SZEDER Gábor wrote: >> diff --git a/ci/run-linux32-build.sh b/ci/run-linux32-build.sh >> index e37e1d2d5f..13047adde3 100755 >> --- a/ci/run-linux32-build

Re: [PATCH 4/5] travis-ci: don't run the test suite as root in the 32 bit Linux build

On Tue, Jan 23, 2018 at 5:43 PM, Jeff King <p...@peff.net> wrote: > On Mon, Jan 22, 2018 at 02:32:19PM +0100, SZEDER Gábor wrote: > >> Travis CI runs the 32 bit Linux build job in a Docker container, where >> all commands are executed as root by default. Therefore

Re: [PATCH 3/5] travis-ci: don't repeat the path of the cache directory

On Tue, Jan 23, 2018 at 5:30 PM, Jeff King <p...@peff.net> wrote: > On Mon, Jan 22, 2018 at 02:32:18PM +0100, SZEDER Gábor wrote: >> diff --git a/ci/run-linux32-build.sh b/ci/run-linux32-build.sh >> index 248183982b..c9476d6598 100755 >> --- a/ci/run-linux32-build

Re: [PATCH 2/5] travis-ci: use 'set -e' in the 32 bit Linux build job

On Tue, Jan 23, 2018 at 5:26 PM, Jeff King <p...@peff.net> wrote: > On Mon, Jan 22, 2018 at 02:32:17PM +0100, SZEDER Gábor wrote: > >> All 'ci/*' scripts use 'set -e' to break the build job if a command >> fails, except 'ci/run-linux32-build.sh' which relies on the &a

Re: [PATCH 3/3] read-cache: don't write index twice if we can't write shared index

On Mon, Jan 22, 2018 at 8:46 PM, Eric Sunshine <sunsh...@sunshineco.com> wrote: > On Mon, Jan 22, 2018 at 1:27 PM, SZEDER Gábor <szeder@gmail.com> wrote: >> - The logs of OSX build jobs have CRCRLF line endings. However, the >> 'base64' util of OSX doesn't wr

Re: [PATCH 3/3] read-cache: don't write index twice if we can't write shared index

On Thu, Jan 18, 2018 at 1:47 PM, Duy Nguyen <pclo...@gmail.com> wrote: > On Thu, Jan 18, 2018 at 6:36 PM, SZEDER Gábor <szeder@gmail.com> wrote: >> This series, queued as 'nd/shared-index-fix', makes the 32 bit Linux >> build job fail on Travis CI. Unfortunatel

Re: [PATCH/RFC 0/2] Automate updating git-completion.bash a bit

On Wed, Jan 17, 2018 at 10:34 AM, Duy Nguyen wrote: > Actually I forgot another option. What if we automate updating the > script at "compile" time instead of calling git at run time? E.g. with > something like below, a contributor could just run > > make update-completion

[PATCH] Use MOVE_ARRAY

Use the helper macro MOVE_ARRAY to move arrays. This is shorter and safer, as it automatically infers the size of elements. Patch generated by Coccinelle and contrib/coccinelle/array.cocci in Travis CI's static analysis build job. Signed-off-by: SZEDER Gábor <szeder@gmail.com> ---

[PATCH 1/5] travis-ci: use 'set -x' for the commands under 'su' in the 32 bit Linux build

Signed-off-by: SZEDER Gábor <szeder@gmail.com> --- ci/run-linux32-build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/run-linux32-build.sh b/ci/run-linux32-build.sh index c19c50c1c9..5a36a8d7c0 100755 --- a/ci/run-linux32-build.sh +++ b/ci/run-linux32-build.sh @@ -26,6

[PATCH 4/5] travis-ci: don't run the test suite as root in the 32 bit Linux build

job failures. To resolve this we should manually delete caches containing such root-owned files, but that would be a hassle. Instead, work this around by changing the owner of the whole contents of the cache directory to the host user ID. Signed-off-by: SZEDER Gábor <szeder@gmail.

[PATCH 0/5] Travis CI: don't run the test suite as root in the 32 bit Linux build

ts to make the debugging this Docked-based build more convenient. SZEDER Gábor (5): travis-ci: use 'set -x' for the commands under 'su' in the 32 bit Linux build travis-ci: use 'set -e' in the 32 bit Linux build job travis-ci: don't repeat the path of the cache directory travis-ci: don't ru

[PATCH 3/5] travis-ci: don't repeat the path of the cache directory

in that case the variable won't be set as there won't be any Travis CI cache. Signed-off-by: SZEDER Gábor <szeder@gmail.com> --- ci/lib-travisci.sh| 7 --- ci/run-build-and-tests.sh | 2 +- ci/run-linux32-build.sh | 6 +++--- ci/run-linux32-docker.sh | 5 - 4 files c

[PATCH 2/5] travis-ci: use 'set -e' in the 32 bit Linux build job

his patch series. Enable 'set -e' for the whole script and for the commands executed under 'su' as well. While touching every line in the 'su' command block anyway, change their indentation to use a tab instead of spaces. Signed-off-by: SZEDER Gábor <szeder@gmail.com> --- ci/run

[PATCH 5/5] travis-ci: don't fail if user already exists on 32 bit Linux build job

in the container, so developers don't have to bother with running a 'userdel' each time before they run the build script. The build job on Travis CI always starts with a fresh Docker container, so this change doesn't make a difference there. Signed-off-by: SZEDER Gábor <szeder@gmail.com> -

Re: [PATCH] describe: use strbuf_add_unique_abbrev() for adding short hashes

On Thu, Jan 18, 2018 at 10:40 PM, René Scharfe <l@web.de> wrote: > Am 16.01.2018 um 18:11 schrieb SZEDER Gábor: >> Unfortunately, most of the changes coming from 'strbuf.cocci' don't >> make any sense, they appear to be the mis-application of the "use >> strbuf

Re: [PATCH 3/3] read-cache: don't write index twice if we can't write shared index

On Thu, Jan 18, 2018 at 10:37 PM, Jeff King wrote: > On Thu, Jan 18, 2018 at 10:00:14PM +0700, Duy Nguyen wrote: > >> The test suite was run as root, no wonder why my removing write access >> has no effect. I got the test to pass with this, but then it fails >> with >> >> Can't

Re: [PATCH v2] packfile: use get_be64() for large offsets

Junio, > The pack-index version 2 format uses two 4-byte integers in network- > byte order to represent one 8-byte value. The current implementation > has several code clones for stitching these integers together. > > Use get_be64() to create an 8-byte integer from two 4-byte integers >

Re: [PATCH 3/3] read-cache: don't write index twice if we can't write shared index

This series, queued as 'nd/shared-index-fix', makes the 32 bit Linux build job fail on Travis CI. Unfortunately, all it can tell us about the failure is this: Test Summary Report --- t1700-split-index.sh (Wstat: 256 Tests: 23 Failed: 1)

Re: [PATCH/RFC 0/2] Automate updating git-completion.bash a bit

On Tue, Jan 16, 2018 at 11:36 AM, Nguyễn Thái Ngọc Duy wrote: > I noticed --recurse-submodules was missing from git-grep complete > list. Then I found a couple more should be on the list as well and > many more in future may face the same faith. Perhaps this helps remedy > this

Re: [PATCH] describe: use strbuf_add_unique_abbrev() for adding short hashes

> Patch generated by Coccinelle (and contrib/coccinelle/strbuf.cocci). Interesting. The static analysis build job on Travis CI runs 'make coccicheck', so it should have caught this. However, I've looked at more build job results than I could count while working on some Travis CI related patches

Re: [PATCH] travis-ci: build Git during the 'script' phase

On Sat, Jan 13, 2018 at 11:54 AM, Jeff King wrote: > I think there's also a similar feature to include timings for each fold, > which might be worth pursuing. If you look for 'travis_time' in the raw log, you'll find lines like these: travis_time:start:01ccbe40 $ some-command

Re: [PATCH] travis-ci: build Git during the 'script' phase

On Sat, Jan 13, 2018 at 11:32 AM, Jeff King <p...@peff.net> wrote: > On Fri, Jan 12, 2018 at 02:32:54PM +0100, SZEDER Gábor wrote: > >> That's the just beginning of a looong list of executed test scripts in >> seemingly pseudo-random order. IMHO that's very rarely th

Re: [PATCH] travis-ci: build Git during the 'script' phase

On Mon, Jan 8, 2018 at 11:38 PM, Lars Schneider <larsxschnei...@gmail.com> wrote: > >> On 08 Jan 2018, at 23:07, Junio C Hamano <gits...@pobox.com> wrote: >> >> SZEDER Gábor <szeder@gmail.com> writes: >> >>> The reason why Travis CI does it

Re: [PATCH] send-email: Support separate Reply-To address

> In some projects contributions from groups are only accepted from a > common group email address. But every individual may want to recieve > replies to her own personal address. That's what we have 'Reply-To' > headers for in SMTP. > > Introduce an optional '--reply-to' command line option.

[PATCH] RelNotes: minor typofix

Signed-off-by: SZEDER Gábor <szeder@gmail.com> --- Documentation/RelNotes/2.16.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/RelNotes/2.16.0.txt b/Documentation/RelNotes/2.16.0.txt index 0c8464492..919f3eb3e 100644 --- a/Documentation/RelNotes/

read test snippet from stdin [was: [PATCH] t3900: add some more quotes]

> I've often wondered if > our tests would be more readable taking the snippet over stdin. > Something like: > > diff --git a/t/t3900-i18n-commit.sh b/t/t3900-i18n-commit.sh > index 9e4e694d93..09ad4d8878 100755 > --- a/t/t3900-i18n-commit.sh > +++ b/t/t3900-i18n-commit.sh > @@ -39,14 +39,14 @@

[PATCH] travis-ci: build Git during the 'script' phase

as well. 'ci/run-builds.sh' now becomes basically empty, remove it. Several of our build job configurations override our default 'before_script' to do nothing; with this change our default 'before_script' won't do anything, either, so remove those overriding directives as well. Signed-off-by: SZED

Re: [PATCH v5 13/34] directory rename detection: tests for handling overwriting untracked files

On Thu, Jan 4, 2018 at 10:10 PM, Elijah Newren <new...@gmail.com> wrote: > On Wed, Jan 3, 2018 at 5:52 PM, SZEDER Gábor <szeder@gmail.com> wrote: > >>> + test $(git rev-parse :0:y/b) = $(git rev-parse O:z/b) && >> >> There is a test

Re: [PATCH v5 13/34] directory rename detection: tests for handling overwriting untracked files

> --- > t/t6043-merge-rename-directories.sh | 337 > > 1 file changed, 337 insertions(+) > +test_expect_failure '10b-check: Overwrite untracked with dir rename + > delete' ' > + ( > + cd 10b && > + > + git checkout A^0 && > +

Re: [PATCH v5 04/34] directory rename detection: basic testcases

> --- > t/t6043-merge-rename-directories.sh | 430 > Many of the new tests added in this patch series perform a lot of checks running 'test', which has the drawback to fail quietly, leaving us no clue about which one of the several conditions failed and why.

Re: [PATCH 2/2] travis-ci: check that all build artifacts are .gitignore-d

On Tue, Jan 2, 2018 at 8:40 PM, Lars Schneider <larsxschnei...@gmail.com> wrote: > >> On 31 Dec 2017, at 17:02, SZEDER Gábor <szeder@gmail.com> wrote: >> >> Every once in a while our explicit .gitignore files get out of sync >> when our build process le

Re: [PATCH 4/4] branch: add '--show-description' option

entation detail that branch descriptions are stored in the config file, and - errors out with a proper error message when the given branch doesn't exist or has no description. Signed-off-by: SZEDER Gábor <szeder@gmail.com> --- Documentation/git-branch.txt

Re: [PATCH 4/4] branch: add '--show-description' option

On Tue, Jan 2, 2018 at 10:32 AM, Johannes Sixt <j...@kdbg.org> wrote: > Am 01.01.2018 um 23:54 schrieb SZEDER Gábor: >>- errors out with a proper error message when the given branch >> doesn't exist (but exits quietly with an error code when the >>

Re: [PATCH 4/4] branch: add '--show-description' option

On Tue, Jan 2, 2018 at 6:17 AM, Eric Sunshine <sunsh...@sunshineco.com> wrote: > On Mon, Jan 1, 2018 at 5:54 PM, SZEDER Gábor <szeder@gmail.com> wrote: > s/exit/exist/ Thanks. >> query does). >> >> Signed-off-by: SZEDER Gábor <szeder@gm

[PATCH 0/4] branch: add '--show-description' option

'git branch' has an option to edit a branch's description, but lacks the option to show that description. The last patch adds the option to do just that. The first three patches are while-at-it minor cleanups and fixes in the area. SZEDER Gábor (4): branch: '--edit-description

[PATCH 1/4] branch: '--edit-description' is incompatible with other options

--edit-description' lists all branches and doesn't edit any branch descriptions, while 'git branch --edit-description --list' edits the current branch's description but doesn't list the branches. Look for '--edit-description', too, when looking for conflicting options. Signed-off-by: SZEDER Gábor

[PATCH 2/4] t3200: fix a misindented line

Signed-off-by: SZEDER Gábor <szeder@gmail.com> --- t/t3200-branch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 503a88d02..e9f55ac04 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -1215,7 +

[PATCH 3/4] t3200: restore branch after "unborn --edit-description" test

by the unborn branch. Furthermore, a new test that will be added later in this series failed first because of this. Use test_when_finished to switch back to the master branch at the end of the test in question. Signed-off-by: SZEDER Gábor <szeder@gmail.com> --- t/t3200-branch.sh | 1 + 1 file c

[PATCH 4/4] branch: add '--show-description' option

doesn't exist (but exits quietly with an error code when the branch does exit but has no description, just like the 'git config' query does). Signed-off-by: SZEDER Gábor <szeder@gmail.com> --- Documentation/git-branch.txt | 6 +- builtin/br

[PATCH 2/2] travis-ci: check that all build artifacts are .gitignore-d

at the end of any build jobs building Git (i.e. the 64 bit Clang and GCC Linux and OSX build jobs, plus the GETTEXT_POISON and 32 bit Linux build jobs) or its documentation, and fail the build job if there are any present. Signed-off-by: SZEDER Gábor <szeder@gmail.com> --- ci/lib-travi

[PATCH 0/2] Travis CI: check unignored build artifacts

independent, but would have a couple of conflicts when applied separately and then merged together, and I don't think it's worth carrying them in separate branches. SZEDER Gábor (2): travis-ci: don't store P4 and Git LFS in the working tree travis-ci: check that all build artifacts are .gitignore-d

[PATCH 1/2] travis-ci: don't store P4 and Git LFS in the working tree

is about to make sure that there are no untracked files present after the build, and the downloaded executables in the working tree are interfering with those upcoming checks. Therefore, let's download P4 and Git LFS in the home directory, outside of the working tree. Signed-off-by: SZEDER Gábor

[PATCHv2 0/3] Travis CI: skip commits with successfully built and tested trees

. - Removed stray whitespace (3/3). - Updated an in-code comment, to make clear which code path deals with a non-existing good trees file (3/3). SZEDER Gábor (3): travis-ci: print the "tip of branch is exactly at tag" message in color travis-ci: create the cache direct

[PATCHv2 3/3] travis-ci: record and skip successfully built trees

, as in this case it's the same build job and the trace log has just been overwritten. Note: this won't kick in if two identical trees are on two different branches, because Travis CI caches are not shared between build jobs of different branches. Signed-off-by: SZEDER Gábor <szeder@gmail.

[PATCHv2 2/3] travis-ci: create the cache directory early in the build process

beginning of every build job. Signed-off-by: SZEDER Gábor <szeder@gmail.com> --- ci/lib-travisci.sh | 2 ++ ci/run-tests.sh| 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/lib-travisci.sh b/ci/lib-travisci.sh index 9d379db8a..197aa14c1 100755 --- a/ci/lib-travisci.sh

[PATCHv2 1/3] travis-ci: print the "tip of branch is exactly at tag" message in color

To make this info message stand out from the regular build job trace output. Signed-off-by: SZEDER Gábor <szeder@gmail.com> --- ci/lib-travisci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/lib-travisci.sh b/ci/lib-travisci.sh index 348fe3c3c..9d379db8a

Re: possible completion bug with --set-upstream-to=

> Whenever I type the last to complete origin/master, as in below: > > > git branch --set-upstream-to=orig > > what I get is: > > > git branch origin/master Yeah, this shouldn't happen. > instead of the expected: > > > git branch --set-upstream-to=origin/master And indeed this is the

Re: [PATCH] Add shell completion for git remote rm

> Keith Smiley wrote: > > It looks like that was just about preferring remove in documentation > > and the like, I think it would still make sense to have both for > > completion since rm is still supported. > > I read it as a first step in a long process to eventually > remove 'remote rm', but

Re: [PATCH 2/2] travis-ci: record and skip successfully built trees

On Fri, Dec 29, 2017 at 9:03 PM, SZEDER Gábor <szeder@gmail.com> wrote: >>>> Or print it in a different color? Maybe red? >>>> >>>> See: https://travis-ci.org/szeder/git/jobs/322247836#L622-L625 >>> >>> I considered using color for

Re: [PATCH 2/2] travis-ci: record and skip successfully built trees

On Thu, Dec 28, 2017 at 12:16 PM, Lars Schneider <larsxschnei...@gmail.com> wrote: > >> On 28 Dec 2017, at 00:00, SZEDER Gábor <szeder@gmail.com> wrote: >> >> On Wed, Dec 27, 2017 at 8:15 PM, Lars Schneider >> <larsxschnei...@gmail.com> wrote: &g

Re: [PATCH 1/2] travis-ci: don't try to create the cache directory unnecessarily

On Wed, Dec 27, 2017 at 8:46 PM, Jonathan Nieder <jrnie...@gmail.com> wrote: > SZEDER Gábor wrote: > >> Travis CI creates that directory for us anyway, even when a previous >> cache doesn't exist for the current build job. >> >> In itself it doesn't hurt to try

Re: [PATCH 2/2] travis-ci: record and skip successfully built trees

On Wed, Dec 27, 2017 at 8:35 PM, Lars Schneider <larsxschnei...@gmail.com> wrote: > >> On 27 Dec 2017, at 17:49, SZEDER Gábor <szeder@gmail.com> wrote: >> Using an ever-growing flat text file might seem like asking for >> trouble on the long run, but it's pe

Re: [PATCH 2/2] travis-ci: record and skip successfully built trees

On Thu, Dec 28, 2017 at 12:00 AM, SZEDER Gábor <szeder@gmail.com> wrote: > On Wed, Dec 27, 2017 at 8:15 PM, Lars Schneider <larsxschnei...@gmail.com> > wrote: >>> + then >>> + cat <<-EOF >>> +

Re: [PATCH 2/2] travis-ci: record and skip successfully built trees

On Wed, Dec 27, 2017 at 8:15 PM, Lars Schneider <larsxschnei...@gmail.com> wrote: > >> On 27 Dec 2017, at 17:49, SZEDER Gábor <szeder@gmail.com> wrote: >> +# Skip the build job if the same tree has already been built and tested >> +# successfully before (e.

Re: [PATCH v3 3/4] travis-ci: save prove state for the 32 bit Linux build

On Wed, Dec 27, 2017 at 7:46 PM, Lars Schneider wrote: >> + --volume "${HOME}/travis-cache:/tmp/travis-cache" \ > > I assume "${HOME}/travis-cache:/usr/src/git/t/.prove" would not > work because that would be a mapping in another mapping? 't/.prove' is a file, but

[PATCH 0/2] Travis CI: skip commits with successfully built and tested trees

ust posted at: https://public-inbox.org/git/20171227163603.13313-1-szeder@gmail.com/ SZEDER Gábor (2): travis-ci: don't try to create the cache directory unnecessarily travis-ci: record and skip successfully built trees ci/lib-travisci.sh| 43 +

[PATCH 1/2] travis-ci: don't try to create the cache directory unnecessarily

this late might cause confusion. Signed-off-by: SZEDER Gábor <szeder@gmail.com> --- ci/run-tests.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/run-tests.sh b/ci/run-tests.sh index f0c743de9..ccdfc2b9d 100755 --- a/ci/run-tests.sh +++ b/ci/run-tests.sh @@ -5,6 +5,5 @@ . ${0%/

[PATCH 2/2] travis-ci: record and skip successfully built trees

are on two different branches, because Travis CI caches are not shared between build jobs of different branches. Signed-off-by: SZEDER Gábor <szeder@gmail.com> --- ci/lib-travisci.sh| 43 +++ ci/run-linux32-docker.sh | 2 ++ ci/run-

[PATCH v3 3/4] travis-ci: save prove state for the 32 bit Linux build

state file in the cache directory, because that's outside of the directory hierarchy accessible from within the container. Signed-off-by: SZEDER Gábor <szeder@gmail.com> --- ci/run-linux32-build.sh | 1 + ci/run-linux32-docker.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/

[PATCH v3 0/4] Rest of the Travis CI fixes

/20171216125418.10743-1-szeder@gmail.com/ v1: https://public-inbox.org/git/20171211233446.10596-1-szeder@gmail.com/ SZEDER Gábor (4): travis-ci: fine tune the use of 'set -x' in 'ci/*' scripts travis-ci: don't install default addon packages for the 32 bit Linux build travis-ci: save

[PATCH v3 4/4] travis-ci: only print test failures if there are test results available

... cat: t/test-results/*.out: No such file or directory Check upfront and proceed only if there are any such files present. Signed-off-by: SZEDER Gábor <szeder@gmail.com> --- ci/print-test-failures.sh | 6 ++ 1 file changed, 6 inse

<    1   2   3   4   5   6   7   8   9   10   >