Re: [PATCH v5 0/7] Fast git status via a file system watcher

On Sat, Jun 10, 2017 at 3:40 PM, Ben Peart wrote: > Changes from V4 include: ... I took a look at this patch series except the last patch ([PATCH v5 7/7] fsmonitor: add a performance test) as Junio reviewed it already, and had only a few comments on patches 3/7 and 4/7. I am

Re: [PATCH 6/6] diff.c: detect blocks despite whitespace changes

Junio C Hamano writes: > Looking at the implementation of get_ws_cleaned_string() that is the > workhorse of emitted_symbol_cmp_no_ws(), it seems to be doing wrong > things for various "ignore whitespace" options (i.e. there is only > one implementation, while "git diff"

Re: [PATCH] git-p4: parse marshal output "p4 -G" in p4 changes

Miguel Torroja writes: > The option -G of p4 (python marshal output) gives more context about the > data being output. That's useful when using the command "change -o" as > we can distinguish between warning/error line and real change description. > > Some p4 triggers

Re: [PATCH] subtree: Obey USE_ASCIIDOCTOR when present

"A. Wilcox" writes: > Defining USE_ASCIIDOCTOR=1 when building Git uses asciidoctor over > asciidoc when generating DocBook and man page documentation. However, > the contrib/subtree module does not presently honour that flag. > > This causes a build failure when

Re: [PATCH 6/6] diff.c: detect blocks despite whitespace changes

Stefan Beller writes: > Reuse the compare function from the hash map instead of calling the > compare function directly. Then we pick the correct compare function > when told to compare ignoring white space. > > Signed-off-by: Stefan Beller > --- >

Re: [PATCH 5/6] diff.c: omit uninteresting moved lines

Stefan Beller writes: > It is useful to have moved lines colored, but there are annoying corner > cases, such as a single line moved, that is very common. For example > in a typical patch of C code, we have closing braces that end statement > blocks or functions. > > While it

Re: [PATCH 4/6] Documentation/diff: reword color moved

Stefan Beller writes: > This is easier for the casual reader. > > Signed-off-by: Stefan Beller > --- > Documentation/config.txt | 6 -- > Documentation/diff-options.txt | 7 --- > 2 files changed, 8 insertions(+), 5 deletions(-) > > diff

Re: [PATCH 2/6] diff.c: change the default for move coloring to zebra

Stefan Beller writes: > Introduce a new mode COLOR_MOVED_DEFAULT, which is the same as > COLOR_MOVED_ZEBRA. But having two different symbols allows us to > differentiate them in the code. > > Signed-off-by: Stefan Beller > --- >

[PATCH] subtree: Obey USE_ASCIIDOCTOR when present

Defining USE_ASCIIDOCTOR=1 when building Git uses asciidoctor over asciidoc when generating DocBook and man page documentation. However, the contrib/subtree module does not presently honour that flag. This causes a build failure when asciidoc is not present on the build system. Instead, adapt

[PATCH 5/6] diff.c: omit uninteresting moved lines

It is useful to have moved lines colored, but there are annoying corner cases, such as a single line moved, that is very common. For example in a typical patch of C code, we have closing braces that end statement blocks or functions. While it is technically true that these lines are moved as they

[PATCH 6/6] diff.c: detect blocks despite whitespace changes

Reuse the compare function from the hash map instead of calling the compare function directly. Then we pick the correct compare function when told to compare ignoring white space. Signed-off-by: Stefan Beller --- diff.c | 3 +--

[PATCH 3/6] diff.c: better reporting on color.moved bogus configuration

Signed-off-by: Stefan Beller --- diff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diff.c b/diff.c index 31cdec05ac..015c854530 100644 --- a/diff.c +++ b/diff.c @@ -276,7 +276,7 @@ static int parse_color_moved(const char *arg) else if

[PATCH 2/6] diff.c: change the default for move coloring to zebra

Introduce a new mode COLOR_MOVED_DEFAULT, which is the same as COLOR_MOVED_ZEBRA. But having two different symbols allows us to differentiate them in the code. Signed-off-by: Stefan Beller --- Documentation/diff-options.txt | 3 +++ diff.c | 13

[PATCH 4/6] Documentation/diff: reword color moved

This is easier for the casual reader. Signed-off-by: Stefan Beller --- Documentation/config.txt | 6 -- Documentation/diff-options.txt | 7 --- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt

[PATCH 1/6] diff.c: factor out shrinking of potential moved line blocks

This is cleaner and keeps the rather large function that performs the move detection smaller. Signed-off-by: Stefan Beller --- diff.c | 50 +- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/diff.c b/diff.c

[PATCH 0/6] Fixing up sb/diff-color-moved

This goes on top of sb/diff-color-moved. Each patch is written as if it can go in as a normal patch, but I intend to squash them into the series appropriately if there is more feedback on that series in general. Stefan Beller (6): diff.c: factor out shrinking of potential moved line blocks

Re: [PATCH v2 0/3] update sha1dc from PR #36

On Tue, Jun 27 2017, Junio C. Hamano jotted: > Ævar Arnfjörð Bjarmason writes: > >> A v2 addressing comments to the v1, tbdiff below. Just fixes the >> subject line on 1/3 & gets rid of the redundant _BIG_ENDIAN detection >> for Solaris, we can just use __sparc (and indeed we

Re: [PATCH v7 6/6] convert: add "status=delayed" to filter process protocol

> On 27 Jun 2017, at 23:30, Junio C Hamano wrote: > > Lars Schneider writes: > >> I treated that as low-prio as I got the impression that you are generally OK >> with >> the current implementation. I promise to send a patch with this change. >>

Re: [PATCH v7 6/6] convert: add "status=delayed" to filter process protocol

> On 27 Jun 2017, at 22:34, Lars Schneider wrote: > > >> On 27 Jun 2017, at 21:00, Junio C Hamano wrote: >> >> Lars Schneider writes: >> >>> @@ -533,7 +534,8 @@ static int start_multi_file_filter_fn(struct >>>

Re: [PATCH 2/2] apply: handle assertion failure gracefully

René Scharfe writes: > Hmm, pondering that, it seems I forgot to reset its value after each > patch. Or better just move it into struct patch, next to the extension > bits: Good catch. > -- >8 -- > Subject: fixup! apply: check git diffs for mutually exclusive header lines > ---

Re: [PATCH v2 0/3] update sha1dc from PR #36

Ævar Arnfjörð Bjarmason writes: > A v2 addressing comments to the v1, tbdiff below. Just fixes the > subject line on 1/3 & gets rid of the redundant _BIG_ENDIAN detection > for Solaris, we can just use __sparc (and indeed we did before this). Thanks. Let's have this tested

Re: [PATCH v2 0/3] update sha1dc from PR #36

Ævar Arnfjörð Bjarmason writes: > A v2 addressing comments to the v1, tbdiff below. Just fixes the > subject line on 1/3 & gets rid of the redundant _BIG_ENDIAN detection > for Solaris, we can just use __sparc (and indeed we did before this). Thanks. Let's have this tested

[PATCH] builtin/fetch cleanup: always set default value for submodule recursing

The check for the default was introduced with 88a21979c5 (fetch/pull: recurse into submodules when necessary, 2011-03-06), which replaced an older construct (builtin/fetchs own implementation of the super-prefix) introduced in be254a0ea9 (Add the 'fetch.recurseSubmodules' config setting,

Re: [PATCH v7 6/6] convert: add "status=delayed" to filter process protocol

Lars Schneider writes: > I treated that as low-prio as I got the impression that you are generally OK > with > the current implementation. I promise to send a patch with this change. > Either as part of this series or as a follow up patch. Sure. I was just being

Re: [PATCH v7 3/6] t0021: write "OUT " only on success

Lars Schneider writes: > Correct! Sorry for the confusion. How about this? > > "rot13-filter.pl" always writes "OUT " to the debug log at the end > of a response. > > This works perfectly for the existing responses "abort", "error", and > "success". A

Re: [PATCH 1/1] ls-remote: remove "-h" from help text

Hi, Silvio Fricke wrote: > This regression was fixed in 91a640ffb6d9 ("ls-remote: a lone "-h" is > asking for help") and the wrong help text was introduced in ba5f28bf79ea > ("ls-remote: use parse-options api"). > This patch removes the "-h" on the help text. > > Signed-off-by: Silvio Fricke

Re: [PATCH v7 3/6] t0021: write "OUT " only on success

> On 27 Jun 2017, at 20:44, Junio C Hamano wrote: > > Lars Schneider writes: > >> "rot13-filter.pl" always writes "OUT " to the debug log at the end >> of a response. >> >> This works without issues for the existing responses "abort", "error", >>

Re: [PATCH v7 6/6] convert: add "status=delayed" to filter process protocol

> On 27 Jun 2017, at 21:00, Junio C Hamano wrote: > > Lars Schneider writes: > >> @@ -533,7 +534,8 @@ static int start_multi_file_filter_fn(struct >> subprocess_entry *subprocess) >> if (err) >> goto done; >> >> -err =

[PATCH 0/1] fix ls-remote help message

Hi, a small patch about a wrong help text. Please include when okay. Best Regards, Silvio Silvio Fricke (1): ls-remote: remove "-h" from help text builtin/ls-remote.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.13.2

[PATCH 1/1] ls-remote: remove "-h" from help text

This regression was fixed in 91a640ffb6d9 ("ls-remote: a lone "-h" is asking for help") and the wrong help text was introduced in ba5f28bf79ea ("ls-remote: use parse-options api"). This patch removes the "-h" on the help text. Signed-off-by: Silvio Fricke ---

[PATCH v2 0/3] update sha1dc from PR #36

A v2 addressing comments to the v1, tbdiff below. Just fixes the subject line on 1/3 & gets rid of the redundant _BIG_ENDIAN detection for Solaris, we can just use __sparc (and indeed we did before this). Junio C Hamano (1): sha1collisiondetection: automatically enable when submodule is

[PATCH v2 2/3] sha1dc: optionally use sha1collisiondetection as a submodule

Add an option to use the sha1collisiondetection library from the submodule in sha1collisiondetection/ instead of in the copy in the sha1dc/ directory. This allows us to try out the submodule in sha1collisiondetection without breaking the build for anyone who's not expecting them as we work out

[PATCH v2 1/3] sha1dc: correct endian detection for Solaris (and others?)

Update sha1dc from my PR #36[1] which'll hopefully be integrated by upstream soon. This solves the Big Endian detection on Solaris reported against v2.13.2[2], hopefully without any regressions. See commit a0103914c2 ("sha1dc: update from upstream", 2017-05-20) and 6b851e536b ("sha1dc: update

[PATCH v2 3/3] sha1collisiondetection: automatically enable when submodule is populated

From: Junio C Hamano If a user wants to experiment with the version of collision detecting sha1 from the submodule, the user needed to not just populate the submodule but also needed to turn the knob. A Makefile trick is easy enough to do so, so let's do this. When somebody

Re: [PATCH 2/2] apply: handle assertion failure gracefully

Am 27.06.2017 um 20:08 schrieb Junio C Hamano: > René Scharfe writes: > >> Thought a bit more about it, and as a result here's a simpler approach: >> >> -- >8 -- >> Subject: [PATCH] apply: check git diffs for mutually exclusive header lines >> >> A file can either be added,

Re: [PATCH 1/3] sha1dc: update from my PR #36

Ævar Arnfjörð Bjarmason writes: > On Tue, Jun 27 2017, Junio C. Hamano jotted: > >> I somehow thought that your throwing a pull request at git.git would >> automatically trigger a Travis test, without you having to wait for >> me to do anything? Am I misinformed? > > It's a PR

Re: [PATCH 1/3] sha1dc: update from my PR #36

On Tue, Jun 27, 2017 at 12:38 PM, Liam R. Howlett wrote: > That's not the case. _BIG_ENDIAN is defined but not to a value. I > believe _BYTE_ORDER is defined as 4321, but _BIG_ENDIAN is just defined. OK. Thanks. That sounds pretty much useless in the 21st century,

Re: [PATCH 1/3] sha1dc: update from my PR #36

* Junio C Hamano [170627 15:10]: > Ævar Arnfjörð Bjarmason writes: > > > Because in the current code is, abbreviated: > > > > #if (defined(_BYTE_ORDER) || defined(__BYTE_ORDER) || > > defined(__BYTE_ORDER__)) > > #if /* byte order is bendian */ > >

Re: [PATCH 1/3] sha1dc: update from my PR #36

Ævar Arnfjörð Bjarmason writes: >>> And since Solaris defines _BYTE_ORDER we never get to checking __sparc, >>> and in fact the "/* byte order is bendian */" test errors out. >>> ... >> Well, if Solaris defines _BYTE_ORDER, doesn't that mean they define >> two constants

Re: [PATCH 1/3] sha1dc: update from my PR #36

On Tue, Jun 27 2017, Junio C. Hamano jotted: > Ævar Arnfjörð Bjarmason writes: > >> Because in the current code is, abbreviated: >> >> #if (defined(_BYTE_ORDER) || defined(__BYTE_ORDER) || >> defined(__BYTE_ORDER__)) >> #if /* byte order is bendian */ >> #define

Re: [PATCH 1/3] sha1dc: update from my PR #36

Junio C Hamano writes: > I wonder if the approach like the following might be cleaner to > extend as we find other oddball platforms. > > #undef __SHA1DC_BYTE_ORDER > #if defined(_BYTE_ORDER) > #define __SHA1DC_BYTE_ORDER _BYTE_ORDER > #elif

[PATCH] git-p4: parse marshal output "p4 -G" in p4 changes

The option -G of p4 (python marshal output) gives more context about the data being output. That's useful when using the command "change -o" as we can distinguish between warning/error line and real change description. Some p4 triggers in the server side generate some warnings when executed.

Re: [PATCH 1/3] sha1dc: update from my PR #36

Ævar Arnfjörð Bjarmason writes: > Because in the current code is, abbreviated: > > #if (defined(_BYTE_ORDER) || defined(__BYTE_ORDER) || > defined(__BYTE_ORDER__)) > #if /* byte order is bendian */ > #define SHA1DC_BIGENDIAN > #endif > #else > #if

Re: [PATCH v7 6/6] convert: add "status=delayed" to filter process protocol

Lars Schneider writes: > @@ -533,7 +534,8 @@ static int start_multi_file_filter_fn(struct > subprocess_entry *subprocess) > if (err) > goto done; > > - err = packet_writel(process->in, "capability=clean", > "capability=smudge", NULL); > +

Re: [PATCH 2/3] sha1dc: optionally use sha1collisiondetection as a submodule

On Tue, Jun 27, 2017 at 8:46 PM, Stefan Beller wrote: > On Tue, Jun 27, 2017 at 5:17 AM, Ævar Arnfjörð Bjarmason > wrote: >> Add an option to use the sha1collisiondetection library from the >> submodule in sha1collisiondetection/ instead of in the copy in

Re: Compile Error v2.13.2 on Solaris SPARC

On Tue, Jun 27 2017, Liam R. Howlett jotted: > This compressed logic is causing a lot of issues. Could we just rewrite > it as a whole lot of #if/#else, statements to avoid running across the > issue where the precompiler does not short-circuit the checks? Would > this cause any other issues?

Re: [PATCH 1/3] sha1dc: update from my PR #36

On Tue, Jun 27 2017, Junio C. Hamano jotted: > Ævar Arnfjörð Bjarmason writes: > +#if defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) +/* + * Should detect Big Endian under glibc.git since 14245eb70e ("entered + * into RCS", 1992-11-25). Defined in which

Re: [PATCH 2/3] sha1dc: optionally use sha1collisiondetection as a submodule

On Tue, Jun 27, 2017 at 5:17 AM, Ævar Arnfjörð Bjarmason wrote: > Add an option to use the sha1collisiondetection library from the > submodule in sha1collisiondetection/ instead of in the copy in the > sha1dc/ directory. > > This allows us to try out the submodule in

Re: [PATCH v7 3/6] t0021: write "OUT " only on success

Lars Schneider writes: > "rot13-filter.pl" always writes "OUT " to the debug log at the end > of a response. > > This works without issues for the existing responses "abort", "error", > and "success". A new response "delayed", that will be introduced in a > subsequent

Re: [PATCH 0/3] update sha1dc from PR #36

On Tue, Jun 27, 2017 at 5:17 AM, Ævar Arnfjörð Bjarmason wrote: > This hopefully fixes the Solaris SPARC issue & doesn't cause > regressions elsewhere, e.g. on Cygwin. Adam, it would be great if you > could test that platform. > > I've already confirmed with Michael Kebe +

Re: Compile Error v2.13.2 on Solaris SPARC

* Junio C Hamano [170627 13:38]: > "Liam R. Howlett" writes: > > > How about: > > > > 8< > > diff --git a/sha1dc/sha1.c b/sha1dc/sha1.c > > index facea1bb5..ed8c63f2d 100644 > > --- a/sha1dc/sha1.c > > +++ b/sha1dc/sha1.c > > @@ -38,9 +38,18

Re: [PATCH 1/3] sha1dc: update from my PR #36

Ævar Arnfjörð Bjarmason writes: >>> +#if defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) >>> +/* >>> + * Should detect Big Endian under glibc.git since 14245eb70e ("entered >>> + * into RCS", 1992-11-25). Defined in which will have been >>> + * brought in by standard headers.

Re: [PATCH 1/3] sha1dc: update from my PR #36

On Tue, Jun 27 2017, Junio C. Hamano jotted: > Ævar Arnfjörð Bjarmason writes: > >> On Tue, Jun 27 2017, Junio C. Hamano jotted: >> >>> Ævar Arnfjörð Bjarmason writes: >>> Update sha1dc from my PR #36[1] which'll hopefully be integrated by

Re: [PATCH 1/3] sha1dc: update from my PR #36

Ævar Arnfjörð Bjarmason writes: > On Tue, Jun 27 2017, Junio C. Hamano jotted: > >> Ævar Arnfjörð Bjarmason writes: >> >>> Update sha1dc from my PR #36[1] which'll hopefully be integrated by >>> upstream soon. >> >> Please be careful about the title of the

Re: [PATCH 1/3] sha1dc: update from my PR #36

On Tue, Jun 27 2017, Junio C. Hamano jotted: > Junio C Hamano writes: > >>> +#if (defined(__ARMEB__) || defined(__THUMBEB__) || defined(__AARCH64EB__) >>> || \ >>> defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || \ >>> defined(__sparc)) >>> +/* >>>

Re: [PATCH 2/2] apply: handle assertion failure gracefully

René Scharfe writes: > Thought a bit more about it, and as a result here's a simpler approach: > > -- >8 -- > Subject: [PATCH] apply: check git diffs for mutually exclusive header lines > > A file can either be added, removed, copied, or renamed, but no two of > these actions can

Re: [PATCH 1/3] sha1dc: update from my PR #36

On Tue, Jun 27 2017, Junio C. Hamano jotted: > Junio C Hamano writes: > >> Ævar Arnfjörð Bjarmason writes: >> >>> +#else /* Not under GCC-alike or glibc or or >>> */ >>> + >>> +#ifdef _BIG_ENDIAN >>> +/* >>> + * Solaris / illumos defines either

Re: [PATCH 1/3] sha1dc: update from my PR #36

On Tue, Jun 27 2017, Junio C. Hamano jotted: > Ævar Arnfjörð Bjarmason writes: > >> Update sha1dc from my PR #36[1] which'll hopefully be integrated by >> upstream soon. > > Please be careful about the title of the patch. "log --oneline" > does not even let you tell your

Re: Compile Error v2.13.2 on Solaris SPARC

On Tue, Jun 27 2017, Liam R. Howlett jotted: > How about: > > 8< > diff --git a/sha1dc/sha1.c b/sha1dc/sha1.c > index facea1bb5..ed8c63f2d 100644 > --- a/sha1dc/sha1.c > +++ b/sha1dc/sha1.c > @@ -38,9 +38,18 @@ > > #if (defined(_BYTE_ORDER) || defined(__BYTE_ORDER) || >

Re: [PATCH/RFC] commit-template: improve readability of commit template

Kaartic Sivaraam writes: >> I personally do not find these new blank lines are necessary, and >> this change wastes vertical screen real estate which is a limited >> resource, but that may be just me. I on the other hand do not think >> the result of this patch

Re: Compile Error v2.13.2 on Solaris SPARC

"Liam R. Howlett" writes: > How about: > > 8< > diff --git a/sha1dc/sha1.c b/sha1dc/sha1.c > index facea1bb5..ed8c63f2d 100644 > --- a/sha1dc/sha1.c > +++ b/sha1dc/sha1.c > @@ -38,9 +38,18 @@ > > #if (defined(_BYTE_ORDER) || defined(__BYTE_ORDER) || >

Re: [PATCH] Spelling fixes

Ville Skyttä writes: > Signed-off-by: Ville Skyttä > --- > Documentation/RelNotes/1.7.10.1.txt | 2 +- > Documentation/RelNotes/2.12.0.txt | 2 +- > Documentation/RelNotes/2.14.0.txt | 2 +- > Documentation/git-reset.txt

Re: Bug: submodules of submodules use absolute gitdir in .git file (instead of relative)

On Tue, Jun 27, 2017 at 8:06 AM, Junio C Hamano wrote: > Robert Siemer writes: > >> Hello everyone, >> >> $ git submodule foreach cat .git >> >> ...shows that the gitdir registered in the .git file of submodules is >> relative. But if you run

Re: [PATCH/RFC] commit-template: improve readability of commit template

On Mon, 2017-06-26 at 14:59 -0700, Junio C Hamano wrote: > We don't usually make a bullet list in log message.  Please stick to > a plain prose.   > > "Previously" is superflous.  Say what it does (e.g. "The commit > template adds optional parts without extra blank lines to its normal > output")

Re: Requesting improvements to "status" in commit template

On Tue, 2017-06-27 at 22:46 +0530, Kaartic Sivaraam wrote: > Hello all, > > There's an attempt to improve the readability of the "status" shown > in > the commit template[1]. It's been quite congested (at least to me) > Sorry, here's the link to the thread. [1] :

Requesting improvements to "status" in commit template

Hello all, There's an attempt to improve the readability of the "status" shown in the commit template[1]. It's been quite congested (at least to me) all these days and thus this attempt to make it more readable. In case anyone wants changes other than those found in that thread please send them

Re: [PATCH 2/2] apply: handle assertion failure gracefully

Am 25.02.2017 um 11:13 schrieb Vegard Nossum: > For the patches in the added testcases, we were crashing with: > > git-apply: apply.c:3665: check_preimage: Assertion `patch->is_new <= 0' > failed. > diff --git a/t/t4154-apply-git-header.sh b/t/t4154-apply-git-header.sh > index

Re: [PATCH 1/2] apply: guard against renames of non-existant empty files

Am 27.02.2017 um 23:18 schrieb René Scharfe: > Am 27.02.2017 um 21:10 schrieb Junio C Hamano: >> René Scharfe writes: >> >>> Would it make sense to mirror the previously existing condition and >>> check for is_new instead? I.e.: >>> >>> if ((!patch->is_delete &&

Re: [PATCH 2/2] apply: handle assertion failure gracefully

Am 28.02.2017 um 11:50 schrieb René Scharfe: > Am 27.02.2017 um 23:33 schrieb Junio C Hamano: >> René Scharfe writes: >> >>> Am 27.02.2017 um 21:04 schrieb Junio C Hamano: René Scharfe writes: >> diff --git a/apply.c b/apply.c >> index

Inquiry 27-06-17

Hello, My name is Ms Julian Smith and i am from Sinara Group Co.Ltd in Russia..We are glad to know about your company from the web and we are interested in your products.Please send us your Latest catalog and price list for our trial order Julian Smith, Purchasing Manager

Re: [PATCH 1/3] sha1dc: update from my PR #36

* Junio C Hamano [170627 11:55]: > Junio C Hamano writes: > > >> +#if (defined(__ARMEB__) || defined(__THUMBEB__) || defined(__AARCH64EB__) > >> || \ > >> defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || \ > >> defined(__sparc))

Re: Compile Error v2.13.2 on Solaris SPARC

How about: 8< diff --git a/sha1dc/sha1.c b/sha1dc/sha1.c index facea1bb5..ed8c63f2d 100644 --- a/sha1dc/sha1.c +++ b/sha1dc/sha1.c @@ -38,9 +38,18 @@ #if (defined(_BYTE_ORDER) || defined(__BYTE_ORDER) || defined(__BYTE_ORDER__)) +#define EMPTY_VAL(x) x ## 1 +#define EMPTY(x)

Re: Solaris 11.3 SPARC grep problem with t1450-fsck.sh

Michael Kebe writes: > Running the test suite on Solaris 11.3 SPARC fails on a test in t1450-fsck.sh. > > not ok 60 - fsck --name-objects > # > # rm -rf name-objects && > # git init name-objects && > # ( > #

"git push --recurse-submodules=on-demand" regression

From: evandrocoan Originally posted on: https://github.com/git-for-windows/git/issues/1212 My git version is: git --version --build-options git version 2.13.0.windows.1 built from commit: eba7af3dbb4c846c6303c5f64102acee696c9ab0 sizeof-long: 4 machine: x86 cmd.exe /c

Re: [PATCH v5 4/7] fsmonitor: add test cases for fsmonitor extension

On Sat, Jun 10, 2017 at 3:40 PM, Ben Peart wrote: > +# fsmonitor works correctly with or without the untracked cache > +# but if it is available, we'll turn it on to ensure we test that > +# codepath as well. > + > +test_lazy_prereq UNTRACKED_CACHE ' > + { git

Re: [PATCH 1/3] sha1dc: update from my PR #36

Junio C Hamano writes: >> +#if (defined(__ARMEB__) || defined(__THUMBEB__) || defined(__AARCH64EB__) >> || \ >> defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || \ >> defined(__sparc)) >> +/* >> + * Should define Big Endian for a whitelist of known

Re: [PATCH 1/3] sha1dc: update from my PR #36

Junio C Hamano writes: > Ævar Arnfjörð Bjarmason writes: > >> +#else /* Not under GCC-alike or glibc or or >> */ >> + >> +#ifdef _BIG_ENDIAN >> +/* >> + * Solaris / illumos defines either _LITTLE_ENDIAN or _BIG_ENDIAN in >> + * . >> + */ >> +#define

Re: [PATCH v5 3/7] fsmonitor: teach git to optionally utilize a file system monitor to speed up detecting new or changed files.

On Sat, Jun 10, 2017 at 3:40 PM, Ben Peart wrote: > +int read_fsmonitor_extension(struct index_state *istate, const void *data, > + unsigned long sz) > +{ > + const char *index = data; > + uint32_t hdr_version; > + uint32_t ewah_size; > + int

Re: [PATCH 1/3] sha1dc: update from my PR #36

Ævar Arnfjörð Bjarmason writes: > Update sha1dc from my PR #36[1] which'll hopefully be integrated by > upstream soon. Please be careful about the title of the patch. "log --oneline" does not even let you tell your readers who calls this as "my" change, and readers would be

Re: Bug: Since Git 2.13.2 git rebase autostash doesn't use fast-forward (poor performance)

neul...@dakosy.de writes: > since the latest version 2.13.2 "git pull --rebase --autostash" doesn't > use a fast forward if possible. This may not be a bug but instead a fix made deliberately. cf. http://public-inbox.org/git/caazatrcaob7exvrcvc9rkmo02g5xcp8gpbajefhfv7zaxvp...@mail.gmail.com/

Re: Bug: submodules of submodules use absolute gitdir in .git file (instead of relative)

Robert Siemer writes: > Hello everyone, > > $ git submodule foreach cat .git > > ...shows that the gitdir registered in the .git file of submodules is > relative. But if you run > > $ git submodule foreach --recursive cat .git > > ...shows that submodules of

Re: [PATCH v4 5/5] stash: implement builtin stash

On Mon, Jun 26, 2017 at 8:53 AM Matthieu Moy wrote: > > Thomas Gummerer writes: > > > After the line > > > > test -n "$seen_non_option" || set "push" "$@" > > > > it's not possible that $# is 0 anymore, so this will never be > > printed. From

Bug: Since Git 2.13.2 git rebase autostash doesn't use fast-forward (poor performance)

Hi, since the latest version 2.13.2 "git pull --rebase --autostash" doesn't use a fast forward if possible. My global git config contains "pull.rebase=preserve" and "rebase.autostash=true". My working directory is clean with no changes. When I use "git pull" git doesn't use a possible fast

Bug: submodules of submodules use absolute gitdir in .git file (instead of relative)

Hello everyone, $ git submodule foreach cat .git ...shows that the gitdir registered in the .git file of submodules is relative. But if you run $ git submodule foreach --recursive cat .git ...shows that submodules of submodules (if you have any) have an absolute gitdir starting with a

[PATCH 3/3] sha1collisiondetection: automatically enable when submodule is populated

From: Junio C Hamano If a user wants to experiment with the version of collision detecting sha1 from the submodule, the user needed to not just populate the submodule but also needed to turn the knob. A Makefile trick is easy enough to do so, so let's do this. When somebody

[PATCH 2/3] sha1dc: optionally use sha1collisiondetection as a submodule

Add an option to use the sha1collisiondetection library from the submodule in sha1collisiondetection/ instead of in the copy in the sha1dc/ directory. This allows us to try out the submodule in sha1collisiondetection without breaking the build for anyone who's not expecting them as we work out

[PATCH 0/3] update sha1dc from PR #36

This hopefully fixes the Solaris SPARC issue & doesn't cause regressions elsewhere, e.g. on Cygwin. Adam, it would be great if you could test that platform. I've already confirmed with Michael Kebe + another SPARC user (CosmicDJ on Freenode #Solaris) that it works on Solaris SPARC. The question

[PATCH 1/3] sha1dc: update from my PR #36

Update sha1dc from my PR #36[1] which'll hopefully be integrated by upstream soon. This solves the Big Endian detection on Solaris reported against v2.13.2[2], hopefully without any regressions. See commit a0103914c2 ("sha1dc: update from upstream", 2017-05-20) and 6b851e536b ("sha1dc: update

Solaris 11.3 SPARC grep problem with t1450-fsck.sh

Running the test suite on Solaris 11.3 SPARC fails on a test in t1450-fsck.sh. not ok 60 - fsck --name-objects # # rm -rf name-objects && # git init name-objects && # ( # cd name-objects && # test_commit julius

[PATCH v7 5/6] convert: move multiple file filter error handling to separate function

Refactoring the filter error handling is useful for the subsequent patch 'convert: add "status=delayed" to filter process protocol'. In addition, replace the parentheses around the empty "if" block with a single semicolon to adhere to the Git style guide. Signed-off-by: Lars Schneider

[PATCH v7 3/6] t0021: write "OUT " only on success

"rot13-filter.pl" always writes "OUT " to the debug log at the end of a response. This works without issues for the existing responses "abort", "error", and "success". A new response "delayed", that will be introduced in a subsequent patch, accepts the input without giving the filtered result

[PATCH v7 4/6] convert: put the flags field before the flag itself for consistent style

Suggested-by: Jeff King Signed-off-by: Lars Schneider --- convert.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/convert.c b/convert.c index f1e168bc30..9907e3b9ba 100644 --- a/convert.c +++ b/convert.c @@ -597,12

[PATCH v7 6/6] convert: add "status=delayed" to filter process protocol

Some `clean` / `smudge` filters may require a significant amount of time to process a single blob (e.g. the Git LFS smudge filter might perform network requests). During this process the Git checkout operation is blocked and Git needs to wait until the filter is done to continue with the checkout.

[PATCH v7 2/6] t0021: make debug log file name configurable

The "rot13-filter.pl" helper wrote its debug logs always to "rot13-filter.log". Make this configurable by defining the log file as first parameter of "rot13-filter.pl". This is useful if "rot13-filter.pl" is configured multiple times similar to the subsequent patch 'convert: add "status=delayed"

[PATCH v7 0/6] convert: add "status=delayed" to filter process protocol

Hi, here is the 7th iteration of my "status delayed" topic. Patch 1 to 3 are minor t0021 test adjustments. Patch 4 is a minor convert.c style adjustment. Patch 5 is a minor "extract method" refactoring in convert.c with an additional minor style adjustment. Patch 6 is the new feature. Changes

[PATCH v7 1/6] t0021: keep filter log files on comparison

The filter log files are modified on comparison. That might be unexpected by the caller. It would be even undesirable if the caller wants to reuse the original log files. Address these issues by using temp files for modifications. This is useful for the subsequent patch 'convert: add

Re: [PATCH v6 6/6] convert: add "status=delayed" to filter process protocol

> On 27 Jun 2017, at 00:13, Junio C Hamano wrote: > > Lars Schneider writes: > >> ... > >>> I am wondering whose responsibility it will be to deal with a path >>> "list-available" reports that are *not* asked by Git or Git got no >>> "delayed"

Re: [PATCH] git-p4: changelist template with p4 -G change -o

Hi Lars/Luke, I tried a first test extending t9807-git-p4-submit.sh. I set this p4 trigger: 'p4test command pre-user-change "echo verbose trigger" '. I'm able to reproduce the issue I wanted to fix. However I found yet another issue, in this case when reading the result from p4_read_pipe_lines

Reply me back!!

I have been trying to reach you

Re: [GSoC][PATCH 6/6 v2] submodule: port submodule subcommand 'deinit' from shell to C

On Tue, Jun 27, 2017 at 1:11 AM, Prathamesh Chavan wrote: > +static void deinit_submodule(const struct cache_entry *list_item, > +void *cb_data) > +{ > + struct deinit_cb *info = cb_data; > + const struct submodule *sub; > + char

  1   2   >