Re: [PATCH v3 2/5] pretty: allow showing specific trailers

2018-11-25 Thread Junio C Hamano
Anders Waldenborg writes: > Would it feel less inconsistent if it did not set the 'only_trailers' > option? If %(trailers:key=...) did not automatically imply 'only', it would be very consistent. But as I already said, I think it would be less convenient, as I do suspect that those who want

Re: [PATCH v11 00/22] Convert "git stash" to C builtin

2018-11-25 Thread Junio C Hamano
Junio C Hamano writes: > Thomas Gummerer writes: > >> Thanks for your work on this! I have read through the range-diff and >> the new patch of this last round, and this addresses all the comments >> I had on v10 (and some more :)). I consider it >> Reviewed-by: Thomas Gummerer > > Thanks. >

Re: [ANNOUNCE] Git v2.20.0-rc1

2018-11-25 Thread Junio C Hamano
Unless I hear otherwise in the next 24 hours, I am planning to merge the following topics to 'master' before cutting -rc2. Please stop me on any of these topics. - jc/postpone-rebase-in-c This may be the most controversial. It demotes the C reimplementation of "git rebase" to an

Re: [PATCH] doc: update diff-format.txt for removed ellipses in --raw

2018-11-25 Thread Junio C Hamano
Greg Hurrell writes: > Since 7cb6ac1e4b ("diff: diff_aligned_abbrev: remove ellipsis after > abbreviated SHA-1 value", 2017-12-03), the "--raw" format of diff > does not add ellipses in an attempt to align the output, but the > documentation was not updated to reflect this. > > Signed-off-by:

Re: [PATCH v3 2/5] pretty: allow showing specific trailers

2018-11-25 Thread Anders Waldenborg
Junio C Hamano writes: > I was confused by the "only" stuff. > > When you give a key (or two), they cannot possibly name non-trailer > lines, so while it may be possible to ask "oh, by the way, I also > want non-trailer lines in addition to signed-off-by and cc lines", > the value of being able

Re: [RFC PATCH 7/7] config.mak.uname: use pkgsrc perl for NetBSD

2018-11-25 Thread Junio C Hamano
Carlo Marcelo Arenas Belón writes: > otherwise will default to /usr/bin/perl which wouldn't normally exist > > Signed-off-by: Carlo Marcelo Arenas Belón > --- > config.mak.uname | 1 + > 1 file changed, 1 insertion(+) I do not have experience with NetBSD so I take your words on face value.

Re: [RFC PATCH 6/7] t5004: use GNU tar to avoid known issues with BSD tar

2018-11-25 Thread Junio C Hamano
Carlo Marcelo Arenas Belón writes: > 56ee96572a ("t5004: resurrect original empty tar archive test", 2013-05-09) > added a test to try to detect and workaround issues with the standard tar > from BSD, but at least in NetBSD would be better to instead require GNU tar > which is available from

Re: [RFC PATCH 5/7] test-lib: use pkgsrc provided unzip for NetBSD

2018-11-25 Thread Junio C Hamano
Carlo Marcelo Arenas Belón writes: > d98b2c5fce ("test-lib: on FreeBSD, look for unzip(1) in /usr/local/bin/", > 2016-07-21) added an exception to the test suite for FreeBSD because the > tests assume functionality not provided by its base unzip tool. > > NetBSD shares that limitation and

Re: [RFC PATCH 4/7] config.mak.uname: NetBSD uses old iconv interface

2018-11-25 Thread Junio C Hamano
Carlo Marcelo Arenas Belón writes: > prevents the following warning : s/^/Doing so / or something to make it a complete sentence. > ... > it is set by optional configure at least since NetBSD 6.0 s/it/It/; Again, makes sense, and thanks for tying this loose end. > Signed-off-by: Carlo

Re: [RFC PATCH 3/7] config.mak.uname: NetBSD uses BSD semantics with fread for directories

2018-11-25 Thread Junio C Hamano
Carlo Marcelo Arenas Belón writes: > this "fixes" test 23 (proper error on directory "files") from t1308 > > other BSD (OpenBSD, MirBSD) likely also affected but they will be > fixed in a different series > > the optional 'configure' sets this automatically and is probably what > most users

Re: [RFC PATCH 2/7] t0301: remove trailing / for dir creation

2018-11-25 Thread Junio C Hamano
Carlo Marcelo Arenas Belón writes: > the semantics of how mkdir -p should work, specially when using -m are > not standard and in this case NetBSD will assume that the permision > should not be changed, breaking the test This does not explain, except for the fuzzy "in this case", why we want

Re: [RFC PATCH 1/7] Documentation: update INSTALL for NetBSD

2018-11-25 Thread Junio C Hamano
Carlo Marcelo Arenas Belón writes: > NetBSD added a BSD licensed reimplementation of GNU libintl to > its base at least since release 4.0 (mid 2012) and git can be > configured to build with it. > > Signed-off-by: Carlo Marcelo Arenas Belón > --- > INSTALL | 6 +++--- > 1 file changed, 3

[PATCH] rebase: mark the C reimplementation as an experimental opt-in feature (was Re: [ANNOUNCE] Git v2.20.0-rc1)

2018-11-25 Thread Junio C Hamano
Junio C Hamano writes: > Ævar Arnfjörð Bjarmason writes: > >>> * "git rebase" and "git rebase -i" have been reimplemented in C. >> >> Here's another regression in the C version (and rc1),... >> I wasn't trying to stress test rebase. I was just wanting to rebase a >> history I was about to

Re: [PATCH v11 00/22] Convert "git stash" to C builtin

2018-11-25 Thread Junio C Hamano
Thomas Gummerer writes: > Thanks for your work on this! I have read through the range-diff and > the new patch of this last round, and this addresses all the comments > I had on v10 (and some more :)). I consider it > Reviewed-by: Thomas Gummerer Thanks. One thing that bothers me is that

Re: [PATCH v11 20/22] stash: convert `stash--helper.c` into `stash.c`

2018-11-25 Thread Junio C Hamano
Paul-Sebastian Ungureanu writes: > The old shell script `git-stash.sh` was removed and replaced > entirely by `builtin/stash.c`. In order to do that, `create` and > `push` were adapted to work without `stash.sh`. For example, before > this commit, `git stash create` called `git stash--helper

Re: [PATCH] files-backend.c: fix build error on Solaris

2018-11-25 Thread Junio C Hamano
Carlo Arenas writes: > Signed-off-by: Carlo Marcelo Arenas Belón Do you mean Tested-by: (meaning, you actually saw the breakage with SunCC without the patch and also saw the patch fixed the breakage)? > clang with -Wpedantic also catch this (at least with Apple LLVM > version 10.0.0); recent

Re: [PATCH] setup.c: remove needless argument passed to open in sanitize_stdfds

2018-11-25 Thread Junio C Hamano
pedrodel...@gmail.com writes: > According to POSIX manual pages, the open() system call's mode > argument specifies the file mode bits to be applied when a new > file is created. If neither O_CREAT nor O_TMPFILE is specified, > then mode is ignored. Correct. While I would say two argument

Re: BUG: CR marker ^M doesn't show up in '-' lines of diffs when the ending of the removed line is CR+LF

2018-11-25 Thread Junio C Hamano
Johannes Sixt writes: > But incorrect whitespace is never highlighted in removed lines, why > should CR be an exception? > ... > Same here for other cases, for example > > -something > +something > > will not have on obvious indicator that whitespace was corrected. All correct, but misses one

Re: [PATCH v3 2/5] pretty: allow showing specific trailers

2018-11-25 Thread Junio C Hamano
Anders Waldenborg writes: > Junio C Hamano writes: >> Also, use of 'key=' automatically turns on 'only' as described, and >> I tend to agree that it would a convenient default mode (i.e. when >> picking certain trailers only with this mechanism, it is likely that >> the user is willing to use

Re: [RFC] Introduce two new commands, switch-branch and restore-paths

2018-11-25 Thread Junio C Hamano
Thomas Gummerer writes: > I like the idea of splitting those commands up, in fact it is > something I've been considering working on myself. I do think we > should consider if we want to change the behaviour of those new > commands in any way compared to 'git checkout', since we're starting >

Re: [PATCH] http-backend: enable cleaning up forked upload/receive-pack on exit

2018-11-25 Thread Junio C Hamano
Max Kirillov writes: > If http-backend dies because of errors, started upload-pack or > receive-pack are not killed and waited, but rather stay running for somtime "sometime" (will fix locally, no reason for a resend). > until they exits because of closed stdin. It may be undesirable in

Re: [PATCH] t5562: do not reuse output files

2018-11-25 Thread Junio C Hamano
Max Kirillov writes: > On Sat, Nov 24, 2018 at 04:47:19PM +0900, Junio C Hamano wrote: >> I do agree that forcing the parent to wait, like you described in >> the comment, would be far more preferrable, > > It looks like it can be done as simple as: > > --- a/http-backend.c > +++

Re: BUG: CR marker ^M doesn't show up in '-' lines of diffs when the ending of the removed line is CR+LF

2018-11-25 Thread brian m. carlson
On Sun, Nov 25, 2018 at 03:03:11PM +0100, Frank Schäfer wrote: > Am 24.11.18 um 23:07 schrieb Johannes Sixt: > > I don't think that there is anything to fix. If you have a file with > > CRLF in it, but you did not declare to Git that CRLF is the expected > > end-of-line indicator, then the CR *is*

Re: [PATCH v3 2/5] pretty: allow showing specific trailers

2018-11-25 Thread Anders Waldenborg
Junio C Hamano writes: > Also, use of 'key=' automatically turns on 'only' as described, and > I tend to agree that it would a convenient default mode (i.e. when > picking certain trailers only with this mechanism, it is likely that > the user is willing to use %(subject) etc. to fill in what

Re: t5570 shaky for anyone ?

2018-11-25 Thread SZEDER Gábor
On Sun, Nov 25, 2018 at 09:52:23PM +0100, Torsten Bögershausen wrote: > After running the "Git 2.20-rc1" testsuite here on a raspi, > the only TC that failed was t5570. > When the "grep" was run on daemon.log, the file was empty (?). > When inspecting it later, it was filled, and grep would have

Re: [RFC] Introduce two new commands, switch-branch and restore-paths

2018-11-25 Thread Thomas Gummerer
On 11/20, Duy Nguyen wrote: > On Mon, Nov 19, 2018 at 04:19:53PM +0100, Duy Nguyen wrote: > > I promise to come back with something better (at least it still > > sounds better in my mind). If that idea does not work out, we can > > come back and see if we can improve this. > > So this is it. The

Re: t5570 shaky for anyone ?

2018-11-25 Thread Thomas Gummerer
On 11/25, Torsten Bögershausen wrote: > After running the "Git 2.20-rc1" testsuite here on a raspi, > the only TC that failed was t5570. > When the "grep" was run on daemon.log, the file was empty (?). > When inspecting it later, it was filled, and grep would have found > the "extended.attribute"

Re: [PATCH v11 00/22] Convert "git stash" to C builtin

2018-11-25 Thread Thomas Gummerer
On 11/23, Paul-Sebastian Ungureanu wrote: > Hello, > > This is the 11th iteration of C git stash. Here are some of the changes, > based on Thomas's and dscho's suggestions (from mailing list / pull request > #495): Thanks for your work on this! I have read through the range-diff and the new

Re: [PATCH v11 03/22] strbuf.c: add `strbuf_insertf()` and `strbuf_vinsertf()`

2018-11-25 Thread Thomas Gummerer
On 11/23, Paul-Sebastian Ungureanu wrote: > Implement `strbuf_insertf()` and `strbuf_vinsertf()` to > insert data using a printf format string. > > Original-idea-by: Johannes Schindelin > Signed-off-by: Paul-Sebastian Ungureanu > --- > strbuf.c | 36 >

Re: BUG: CR marker ^M doesn't show up in '-' lines of diffs when the ending of the removed line is CR+LF

2018-11-25 Thread Johannes Sixt
Am 25.11.18 um 15:03 schrieb Frank Schäfer: Am 24.11.18 um 23:07 schrieb Johannes Sixt: I don't think that there is anything to fix. If you have a file with CRLF in it, but you did not declare to Git that CRLF is the expected end-of-line indicator, then the CR *is* trailing whitespace (because

t5570 shaky for anyone ?

2018-11-25 Thread Torsten Bögershausen
After running the "Git 2.20-rc1" testsuite here on a raspi, the only TC that failed was t5570. When the "grep" was run on daemon.log, the file was empty (?). When inspecting it later, it was filled, and grep would have found the "extended.attribute" it was looking for. The following fixes it,

[PATCH] setup.c: remove needless argument passed to open in sanitize_stdfds

2018-11-25 Thread pedrodelyra
From: Pedro de Lyra Signed-off-by: Pedro de Lyra --- According to POSIX manual pages, the open() system call's mode argument specifies the file mode bits to be applied when a new file is created. If neither O_CREAT nor O_TMPFILE is specified, then mode is ignored. So I guess that 0 argument

Re: What's cooking in git.git (Sep 2018, #01; Tue, 4)

2018-11-25 Thread Ævar Arnfjörð Bjarmason
On Sun, Nov 25 2018, Torsten Bögershausen wrote: > On Sun, Nov 25, 2018 at 05:28:35AM +0100, Torsten Bögershausen wrote: >> On Sat, Nov 24, 2018 at 08:33:37PM +0100, Ævar Arnfjörð Bjarmason wrote: >> > >> > On Wed, Sep 05 2018, Ævar Arnfjörð Bjarmason wrote: >> > >> > > On Wed, Sep 05 2018,

Re: BUG: CR marker ^M doesn't show up in '-' lines of diffs when the ending of the removed line is CR+LF

2018-11-25 Thread Frank Schäfer
Am 24.11.18 um 23:07 schrieb Johannes Sixt: > I don't think that there is anything to fix. If you have a file with > CRLF in it, but you did not declare to Git that CRLF is the expected > end-of-line indicator, then the CR *is* trailing whitespace (because > the line ends at LF), and 'git diff'

For your Perusal

2018-11-25 Thread John William
Dearest , Its really good to see your Prompt Response it show how Responsible and diligent you will be in handling the sum of $10.5 MILLION if placed in your care and for investment Purposes in your Country . These said Funds have being placed in Safekeeping in DEUTSCHE BANK in SOUTH AFRICA

[RFC PATCH 5/7] test-lib: use pkgsrc provided unzip for NetBSD

2018-11-25 Thread Carlo Marcelo Arenas Belón
d98b2c5fce ("test-lib: on FreeBSD, look for unzip(1) in /usr/local/bin/", 2016-07-21) added an exception to the test suite for FreeBSD because the tests assume functionality not provided by its base unzip tool. NetBSD shares that limitation and provides a package that could be used instead so all

[RFC PATCH 7/7] config.mak.uname: use pkgsrc perl for NetBSD

2018-11-25 Thread Carlo Marcelo Arenas Belón
otherwise will default to /usr/bin/perl which wouldn't normally exist Signed-off-by: Carlo Marcelo Arenas Belón --- config.mak.uname | 1 + 1 file changed, 1 insertion(+) diff --git a/config.mak.uname b/config.mak.uname index 59ce03819b..d2edb723f4 100644 --- a/config.mak.uname +++

[RFC PATCH 6/7] t5004: use GNU tar to avoid known issues with BSD tar

2018-11-25 Thread Carlo Marcelo Arenas Belón
56ee96572a ("t5004: resurrect original empty tar archive test", 2013-05-09) added a test to try to detect and workaround issues with the standard tar from BSD, but at least in NetBSD would be better to instead require GNU tar which is available from pkgsrc Signed-off-by: Carlo Marcelo Arenas

[RFC PATCH 2/7] t0301: remove trailing / for dir creation

2018-11-25 Thread Carlo Marcelo Arenas Belón
the semantics of how mkdir -p should work, specially when using -m are not standard and in this case NetBSD will assume that the permision should not be changed, breaking the test -p is technically not needed either, but will be cleared in a future patch eventhough it could be considered an

[RFC PATCH 4/7] config.mak.uname: NetBSD uses old iconv interface

2018-11-25 Thread Carlo Marcelo Arenas Belón
prevents the following warning : utf8.c: In function 'reencode_string_iconv': utf8.c:486:28: warning: passing argument 2 of 'iconv' from incompatible pointer type [-Wincompatible-pointer-types] size_t cnt = iconv(conv, , , , ); ^ In file included from

[RFC PATCH 3/7] config.mak.uname: NetBSD uses BSD semantics with fread for directories

2018-11-25 Thread Carlo Marcelo Arenas Belón
this "fixes" test 23 (proper error on directory "files") from t1308 other BSD (OpenBSD, MirBSD) likely also affected but they will be fixed in a different series the optional 'configure' sets this automatically and is probably what most users from this platform had been doing as a workaround

[RFC PATCH 1/7] Documentation: update INSTALL for NetBSD

2018-11-25 Thread Carlo Marcelo Arenas Belón
NetBSD added a BSD licensed reimplementation of GNU libintl to its base at least since release 4.0 (mid 2012) and git can be configured to build with it. Signed-off-by: Carlo Marcelo Arenas Belón --- INSTALL | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/INSTALL

[RFC PATCH 0/7] test: NetBSD support

2018-11-25 Thread Carlo Marcelo Arenas Belón
Likely still missing changes as it only completes a run with a minimal number of dependencies but open for feedback Requires pkgsrc packages for gmake, perl, bash and curl and completes a run $ gmake SHELL_PATH=/usr/pkg/bin/bash NO_PYTHON=1 CURL_DIR=/usr/pkg test Carlo Marcelo Arenas Belón

Re: [PATCH] files-backend.c: fix build error on Solaris

2018-11-25 Thread Duy Nguyen
On Sun, Nov 25, 2018 at 11:19 AM Carlo Arenas wrote: > > Signed-off-by: Carlo Marcelo Arenas Belón > > clang with -Wpedantic also catch this (at least with Apple LLVM > version 10.0.0); recent versions of gcc also include that flag and at > least 8.2.0 shows a warning for it, so it might be

Re: [PATCH] files-backend.c: fix build error on Solaris

2018-11-25 Thread Carlo Arenas
Signed-off-by: Carlo Marcelo Arenas Belón clang with -Wpedantic also catch this (at least with Apple LLVM version 10.0.0); recent versions of gcc also include that flag and at least 8.2.0 shows a warning for it, so it might be worth adding it to developer mode (maybe under the pedantic DEVOPTS),

Re: What's cooking in git.git (Sep 2018, #01; Tue, 4)

2018-11-25 Thread Torsten Bögershausen
On Sun, Nov 25, 2018 at 05:28:35AM +0100, Torsten Bögershausen wrote: > On Sat, Nov 24, 2018 at 08:33:37PM +0100, Ævar Arnfjörð Bjarmason wrote: > > > > On Wed, Sep 05 2018, Ævar Arnfjörð Bjarmason wrote: > > > > > On Wed, Sep 05 2018, Eric Sunshine wrote: > > [] > > > > SunCC used to be ahead