Workflow for GitHub branch model interop: advice?

2019-02-09 Thread William Chargin
Hi Git folks, I’m looking into automating a Git workflow, and am interested in folks’ feedback about whether my plan is reasonable or insane. The problem that I’m trying to solve is: I use GitHub a lot for work, but often find myself frustrated with GitHub’s “one-branch-per-change” model, as oppo

Re: [PATCH] Add support for 'git remote rm' in Bash completion script

2019-02-09 Thread Todd Zullinger
Hi, Keith Smiley wrote: >> On Feb 8, 2019, at 22:27, Todd Zullinger wrote: >> >> Hi Sergey, >> >> There was a previous discussion of this in December 2017, >> which might be useful: >> >> https://public-inbox.org/git/01020160a0004473-277c3d7c-4e3b-4c50-9d44-4a106f37f1d9-000...@eu-west-1.amazon

Re: [Patch v1 3/3] t5562: replace /dev/zero with a pipe from generate_zero_bytes

2019-02-09 Thread Eric Sunshine
On Sat, Feb 9, 2019 at 1:59 PM wrote: > This change removes the dependency on /dev/zero with an equivalent pipe of Too many spaces between "equivalent" and "pipe". > deliberately NUL bytes. This allows tests to proceed where /dev/zero > does not exist. It wouldn't hurt to cite "NonStop" as an

Re: [Patch v1 2/3] t5318: replace use of /dev/zero with generate_zero_bytes

2019-02-09 Thread Eric Sunshine
On Sat, Feb 9, 2019 at 2:00 PM wrote: > This change removes the dependency on /dev/zero with generate_zero_bytes > appending NUL values to blocks generating wrong signatures for test cases. This commit message says what the patch does but not _why_. At minimum, it should explain that /dev/zero is

Re: [Patch v1 1/3] test-lib-functions.sh: add generate_zero_bytes function

2019-02-09 Thread Eric Sunshine
On Sat, Feb 9, 2019 at 1:59 PM wrote: > t5318 and t5562 used /dev/zero, which is not portable. This function > provides both a fixed block of NUL bytes and an infinite stream of NULs. > > Signed-off-by: Randall S. Becker > --- > diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh > @@

Re: [PATCH] utf8: handle systems that don't write BOM for UTF-16

2019-02-09 Thread Eric Sunshine
On Sat, Feb 9, 2019 at 3:08 PM brian m. carlson wrote: > [...] > Add a Makefile and #define knob, ICONV_NEEDS_BOM, that can be set if the > iconv implementation has this behavior. When set, Git will write a BOM > manually for UTF-16 and UTF-32 and then force the data to be written in > UTF-16BE or

[Fix v1] config.mak.uname: add FREAD_READS_DIRECTORIES for NonStop platform

2019-02-09 Thread randall . s . becker
From: "Randall S. Becker" The NonStop platform needs this configuration item specified as UnfortunatelyYes so that config directory files are correctly processed. Signed-off-by: Randall S. Becker --- config.mak.uname | 1 + 1 file changed, 1 insertion(+) diff --git a/config.mak.uname b/config

RE: [Possible Breakage] t1308 - Bad return value from test-tool

2019-02-09 Thread Randall S. Becker
On February 9, 2019 18:33, Jeff King wrote: > On Sat, Feb 09, 2019 at 01:08:01PM -0500, Randall S. Becker wrote: > > > > It sounds like you might need to set FREAD_READS_DIRECTORIES in your > > > config.mak. > > > > Setting FREAD_READS_DIRECTORIES = UnfortunatelyYes > > Silly question, but you di

Re: [Possible Breakage] t1308 - Bad return value from test-tool

2019-02-09 Thread Jeff King
On Sat, Feb 09, 2019 at 01:08:01PM -0500, Randall S. Becker wrote: > > It sounds like you might need to set FREAD_READS_DIRECTORIES in your > > config.mak. > > Setting FREAD_READS_DIRECTORIES = UnfortunatelyYes Silly question, but you did rebuild after setting that, not just re-run the tests, ri

Re: [Breakage] Git v2.21.0-rc0 - t5318 (NonStop)

2019-02-09 Thread Jeff King
On Sat, Feb 09, 2019 at 09:39:43AM +0100, Johannes Sixt wrote: > > Great. Since it sounds like you're preparing some patches to deal with > > /dev/zero elsewhere, do you want to wrap it up in a patch as part of > > that? > > Please do not use yes to generate an infinite amount of bytes. Our > imp

Re: [PATCH 0/2] t/lib-gpg: a gpgsm fix, a minor improvement, and a question

2019-02-09 Thread Todd Zullinger
SZEDER Gábor wrote: > On Thu, Feb 07, 2019 at 10:17:44PM -0500, Todd Zullinger wrote: >> Looking through the build logs for the fedora git packages, I noticed it >> was missing the GPGSM prereq. > > Just curious: how did you noticed the missing GPGSM prereq? I just grep the build output for '# SK

Re: [Fix v2] t5562: remove dependency on /dev/zero

2019-02-09 Thread Johannes Sixt
Am 09.02.19 um 19:25 schrieb Junio C Hamano: > Johannes Sixt writes: > >> How many bytes are needed here? yes() in test-lib.sh generates only 99 >> 'y', if I am not mistaken. > > I think we will not use "yes" in the end for this topic, which makes > this comment totally irrelevant to the thread,

Re: [PATCH] Fix typos in translatable strings for v2.21.0

2019-02-09 Thread Jean-Noël AVILA
Please forget this one. Will re-submit.

[PATCH] Fix typos in translatable strings for v2.21.0

2019-02-09 Thread Jean-Noël Avila
Signed-off-by: Jean-Noël Avila --- builtin/bisect--helper.c | 4 ++-- builtin/fetch.c | 2 +- builtin/rebase.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index c1cff32661..e7325fe37f 100644 --- a/buil

RE: [Hang] t5562 subtest 8 on NonStop

2019-02-09 Thread Randall S. Becker
On February 8, 2019 7:23, I wrote: > We have suddenly encountered a hung git-http-backend in t5562 in the > NonStop port. This is a new problem not seen before on the platform, > surprisingly. I am wondering whether this is a result of not actually having an > apache2 server on-board. Is that a pos

[PATCH] utf8: handle systems that don't write BOM for UTF-16

2019-02-09 Thread brian m. carlson
When serializing UTF-16 (and UTF-32), there are three possible ways to write the stream. One can write the data with a BOM in either big-endian or little-endian format, or one can write the data without a BOM in big-endian format. Most systems' iconv implementations choose to write it with a BOM i

[Proposed Fix] daemon.c: not initializing revents

2019-02-09 Thread Randall S. Becker
Hi All, I found this while trying to track down a hang in t5562 - this isn't the fix, but here it is something that could be considered a code-inspection. If there have been random unexplained hangs when git runs as a daemon, this might be the cause. According to many systems (other than Linux),

Re: [PATCHv2] git-p4: ticket expiry test: use a fake p4 to avoid use of 'sleep'

2019-02-09 Thread Luke Diamand
On Sat, 9 Feb 2019 at 18:06, Junio C Hamano wrote: > > SZEDER Gábor writes: > > > On Fri, Feb 08, 2019 at 07:02:31PM +, Luke Diamand wrote: > >> +# create a fake version of "p4" which returns a TicketExpiration based > >> +# on $EXPIRY, for testing login expiration > >> +create_fake_p4() { >

RE: [Fix v2] t5562: remove dependency on /dev/zero

2019-02-09 Thread Randall S. Becker
On February 9, 2019 13:25, Junio C Hamano wrote: > Johannes Sixt writes: > > > How many bytes are needed here? yes() in test-lib.sh generates only 99 > > 'y', if I am not mistaken. > > I think we will not use "yes" in the end for this topic, which makes this > comment totally irrelevant to the t

Re: [PATCH v3 7/8] checkout: introduce --{,no-}overlay option

2019-02-09 Thread Philip Oakley
Hi, On 24/01/2019 01:12, Jonathan Nieder wrote: Hi, Junio C Hamano wrote: Thomas Gummerer writes: Jonathan Nieder wrote: Is this analogous to "git add --ignore-removal"? If so, can we just call it --ignore-removal? Yes, it seems like they are very similar. Hmm, I am not sure if the word

[Patch v1 2/3] t5318: replace use of /dev/zero with generate_zero_bytes

2019-02-09 Thread randall . s . becker
From: "Randall S. Becker" This change removes the dependency on /dev/zero with generate_zero_bytes appending NUL values to blocks generating wrong signatures for test cases. Signed-off-by: Randall S. Becker --- t/t5318-commit-graph.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

[Patch v1 1/3] test-lib-functions.sh: add generate_zero_bytes function

2019-02-09 Thread randall . s . becker
From: "Randall S. Becker" t5318 and t5562 used /dev/zero, which is not portable. This function provides both a fixed block of NUL bytes and an infinite stream of NULs. Signed-off-by: Randall S. Becker --- t/test-lib-functions.sh | 13 + 1 file changed, 13 insertions(+) diff --git

[Patch v1 3/3] t5562: replace /dev/zero with a pipe from generate_zero_bytes

2019-02-09 Thread randall . s . becker
From: "Randall S. Becker" This change removes the dependency on /dev/zero with an equivalent pipe of deliberately NUL bytes. This allows tests to proceed where /dev/zero does not exist. Signed-off-by: Randall S. Becker --- t/t5562-http-backend-content-length.sh | 4 ++-- 1 file changed, 2 ins

[Patch v1 0/3] 2.21.0-rc0 test fixes resulting from use of /dev/zero

2019-02-09 Thread randall . s . becker
From: "Randall S. Becker" This is a candidate packages of fixes to remove dependence on /dev/zero and replaces it with the generate_zero_bytes function in test-lib-functions.sh Randall S. Becker (3): test-lib-functions.sh: add generate_zero_bytes function t5318: replace use of /dev/zero with

Re: [PATCH v2] git-compat-util: undefine fileno if defined

2019-02-09 Thread Junio C Hamano
Dan McGregor writes: > Commit 8dd2e88a92 ("http: support file handles for HTTP_KEEP_ERROR", > 2019-01-10) introduced an implicit assumption that rewind, fileno, and > fflush are functions. At least on FreeBSD fileno is not, and as such > passing a void * failed. > > All systems tested (FreeBSD an

Re: [Fix v2] t5562: remove dependency on /dev/zero

2019-02-09 Thread Junio C Hamano
Johannes Sixt writes: > How many bytes are needed here? yes() in test-lib.sh generates only 99 > 'y', if I am not mistaken. I think we will not use "yes" in the end for this topic, which makes this comment totally irrelevant to the thread, but I wonder why we have the limit of 99 there? It cann

Re: Possible minor bug in Git

2019-02-09 Thread Philip Oakley
Hi Guiseppe, On 07/02/2019 19:41, Johannes Schindelin wrote: Hi Giuseppe, On Wed, 6 Feb 2019, Giuseppe Crinò wrote: I wanted to have a look at the bug, and I can correctly reproduce it using version 2.20.1.windows.1. Thank you for having a look. The root cause of the issues will most prob

RE: [Possible Breakage] t1308 - Bad return value from test-tool

2019-02-09 Thread Randall S. Becker
On February 8, 2019 23:24, Jeff King wrote: > On Fri, Feb 08, 2019 at 04:42:19PM -0500, Randall S. Becker wrote: > > > t1308 has me perplexed - this is an old breakage on the NonStop > > platform, that I have just gotten around to checking with the new bash > > version we have. When running sub-te

Re: [PATCHv2] git-p4: ticket expiry test: use a fake p4 to avoid use of 'sleep'

2019-02-09 Thread Junio C Hamano
SZEDER Gábor writes: > On Fri, Feb 08, 2019 at 07:02:31PM +, Luke Diamand wrote: >> +# create a fake version of "p4" which returns a TicketExpiration based >> +# on $EXPIRY, for testing login expiration >> +create_fake_p4() { >> +( >> +cd "$git" && mkdir expire-p4 && >> +

[Fix v2] config.mak.uname: move location of bash on NonStop to CoreUtils

2019-02-09 Thread randall . s . becker
From: "Randall S. Becker" The default bash is now officially in /usr/coreutils/bin instead of in /usr/local/bin. This version of bash is more stable and recommended for all use as of the J06.22 and L18.02 operating system revision levels. This new version provides more stability of test results.

[Fix v1] config.mak.uname: move location of bash on NonStop to CoreUtils

2019-02-09 Thread randall . s . becker
From: "Randall S. Becker" The default bash is now officially in /usr/coreutils/bin instead of in /usr/local/bin. This version of bash is more stable and recommended for all use as of the J06.22 and L18.02 operating system revision levels. This new version provides more stability of test results.

RE: [Fix v2] t5562: remove dependency on /dev/zero

2019-02-09 Thread Randall S. Becker
On February 8, 2019 18:39, Junio C Hamano wrote: > randall.s.bec...@rogers.com writes: > > Replaced subtest 15 (CONTENT_LENGTH overflow ssite_t) use of /dev/zero > > with yes and a translation of its result to a stream of NULL. This is > > a more portable solution. > > > > Signed-off-by: Randall S.

RE: [Breakage] Git v2.21.0-rc0 - t5318 (NonStop)

2019-02-09 Thread Randall S. Becker
On February 9, 2019 3:40, Johannes Sixt wrote: > Am 09.02.19 um 05:24 schrieb Jeff King: > > On Fri, Feb 08, 2019 at 05:53:53PM -0500, Randall S. Becker wrote: > > > >>> diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index > >>> 92cf8f812c..4afab14431 100644 > >>> --- a/t/test-lib-

RE: [Breakage] Git v2.21.0-rc0 - t5318 (NonStop)

2019-02-09 Thread Randall S. Becker
On February 8, 2019 23:25, Jeff King wrote: > On Fri, Feb 08, 2019 at 05:53:53PM -0500, Randall S. Becker wrote: > > > > diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index > > > 92cf8f812c..4afab14431 100644 > > > --- a/t/test-lib-functions.sh > > > +++ b/t/test-lib-functions.sh

Re: [PATCH] Add support for 'git remote rm' in Bash completion script

2019-02-09 Thread Keith Smiley
It would be great if we could land this. Non of the other solutions since I proposed my patch have happened, so in the meantime this would be nice to have. -- Keith Smiley > On Feb 8, 2019, at 22:27, Todd Zullinger wrote: > > Hi Sergey, > > There was a previous discussion of this in December

Re: t0028-working-tree-encoding.sh failing on musl based systems (Alpine Linux)

2019-02-09 Thread Kevin Daudt
On Fri, Feb 08, 2019 at 08:42:19PM +, brian m. carlson wrote: > On Fri, Feb 08, 2019 at 09:23:36PM +0100, Kevin Daudt wrote: > > Firstly, the tests expect iconv -t UTF-16 to output a BOM, which it > > indeed does not do on Alpine. Secondly, git itself also expects the BOM > > to be present when

Re: [PATCH] unpack-trees.c: fix writing "link" index ext with null base oid

2019-02-09 Thread Luke Diamand
On Sat, 9 Feb 2019 at 11:23, Nguyễn Thái Ngọc Duy wrote: > > Since commit 7db118303a (unpack_trees: fix breakage when o->src_index != > o->dst_index - 2018-04-23) and changes in merge code to use separate > index_state for source and destination, when doing a merge with split > index activated, we

Re: [PATCH 0/2] t/lib-gpg: a gpgsm fix, a minor improvement, and a question

2019-02-09 Thread SZEDER Gábor
On Thu, Feb 07, 2019 at 10:17:44PM -0500, Todd Zullinger wrote: > Looking through the build logs for the fedora git packages, I noticed it > was missing the GPGSM prereq. Just curious: how did you noticed the missing GPGSM prereq? I'm asking because I use a patch for a good couple of months now t

[L10N] Kickoff for Git 2.21.0 round 1

2019-02-09 Thread Jiang Xin
Hi, Git v2.21.0-rc0 has been released, and it's time to start new round of git l10n. This time there are 214 updated messages need to be translated since last update: l10n: git.pot: v2.21.0 round 1 (214 new, 38 removed) Generate po/git.pot from v2.21.0-rc0-30-g11ad41d4cb (Seventh batch f

[PATCH] unpack-trees.c: fix writing "link" index ext with null base oid

2019-02-09 Thread Nguyễn Thái Ngọc Duy
Since commit 7db118303a (unpack_trees: fix breakage when o->src_index != o->dst_index - 2018-04-23) and changes in merge code to use separate index_state for source and destination, when doing a merge with split index activated, we may run into this line in unpack_trees(): o->result.split_inde

Re: could not freshen shared index ..../sharedindex.0000000000000000000000000000000000000000'

2019-02-09 Thread Duy Nguyen
On Sat, Feb 9, 2019 at 4:58 PM Luke Diamand wrote: > > On Sat, 9 Feb 2019 at 05:01, Duy Nguyen wrote: > > > > On Fri, Feb 8, 2019 at 11:39 PM Luke Diamand wrote: > > > > > > On Fri, 8 Feb 2019 at 10:02, Duy Nguyen wrote: > > > > > > > > On Wed, Feb 06, 2019 at 10:25:25AM +, Luke Diamand wro

Re: could not freshen shared index ..../sharedindex.0000000000000000000000000000000000000000'

2019-02-09 Thread Luke Diamand
On Sat, 9 Feb 2019 at 05:01, Duy Nguyen wrote: > > On Fri, Feb 8, 2019 at 11:39 PM Luke Diamand wrote: > > > > On Fri, 8 Feb 2019 at 10:02, Duy Nguyen wrote: > > > > > > On Wed, Feb 06, 2019 at 10:25:25AM +, Luke Diamand wrote: > > > > I've recently started seeing a lot of this message when

Re: [Fix v2] t5562: remove dependency on /dev/zero

2019-02-09 Thread Johannes Sixt
Am 08.02.19 um 23:07 schrieb randall.s.bec...@rogers.com: > From: "Randall S. Becker" > > Replaced subtest 15 (CONTENT_LENGTH overflow ssite_t) use of /dev/zero > with yes and a translation of its result to a stream of NULL. This is > a more portable solution. > > Signed-off-by: Randall S. Becke

Re: [Breakage] Git v2.21.0-rc0 - t5318 (NonStop)

2019-02-09 Thread Johannes Sixt
Am 09.02.19 um 05:24 schrieb Jeff King: > On Fri, Feb 08, 2019 at 05:53:53PM -0500, Randall S. Becker wrote: > >>> diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index >>> 92cf8f812c..4afab14431 100644 >>> --- a/t/test-lib-functions.sh >>> +++ b/t/test-lib-functions.sh >>> @@ -1302

Re: t0028-working-tree-encoding.sh failing on musl based systems (Alpine Linux)

2019-02-09 Thread Torsten Bögershausen
On 08.02.19 07:04, Rich Felker wrote: > On Fri, Feb 08, 2019 at 12:17:05AM +, brian m. carlson wrote: [] >> Even if Git were to produce a BOM to work around this issue, then we'd >> still have the problem that any program using musl will write data in >> UTF-16 without a BOM. Moreover, because