Re: [PATCH 24/31] archive-tar: make hash size independent

2019-02-11 Thread René Scharfe
Am 12.02.2019 um 02:22 schrieb brian m. carlson: > diff --git a/builtin/get-tar-commit-id.c b/builtin/get-tar-commit-id.c > index 2706fcfaf2..2760549e91 100644 > --- a/builtin/get-tar-commit-id.c > +++ b/builtin/get-tar-commit-id.c > @@ -5,6 +5,7 @@ > #include "commit.h" > #include "tar.h" > #in

Re: [PATCH 04/31] pack-bitmap: replace sha1_to_hex

2019-02-11 Thread Jeff King
On Tue, Feb 12, 2019 at 01:22:29AM +, brian m. carlson wrote: > Replace the uses of sha1_to_hex in the pack bitmap code with hash_to_hex > to allow the use of SHA-256 as well. Rename a few variables since they > are no longer limited to SHA-1. Sounds good, although... > -static uint32_t fin

[PATCH 1/2] RelNotes/2.21: tweak "--date=auto" mention

2019-02-11 Thread Jeff King
In the feature that was eventually committed, "--date=auto" doesn't do anything. It was generalized to "--date=auto:". Signed-off-by: Jeff King --- Documentation/RelNotes/2.21.0.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/RelNotes/2.21.0.txt b/Doc

[PATCH 2/2] RelNotes/2.21: misc typo/English fixups

2019-02-11 Thread Jeff King
These are just some small fixes I noticed doing a complete read-through (there are a few cases I left that are incomplete or abbreviated sentences, but I think those are OK in this sort of bullet-list style). Signed-off-by: Jeff King --- Documentation/RelNotes/2.21.0.txt | 10 +- 1 file

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

2019-02-11 Thread Elijah Newren
On Sat, Feb 9, 2019 at 3:23 AM 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,

Re: [PATCH] git-submodule.txt: document default behavior

2019-02-11 Thread Duy Nguyen
On Tue, Feb 12, 2019 at 11:04 AM Denton Liu wrote: > > This patch documents the default behavior of git-submodule if no > subcommands are given, similar to how git-remote.txt documents it. > > Signed-off-by: Denton Liu > --- > Documentation/git-submodule.txt | 3 +++ > 1 file changed, 3 insertio

Hotfix Branching Strategy

2019-02-11 Thread Roman Gelfand
At any one time, up to 3 developers could be developing hotfixes addressing issues.Whether it is one or multiple people working on hotfixes, we always want to produce one hotfix. Each hotfix is a cumulative update since beginning of release. Just about every hotfix requires database upgrade.

[PATCH] git-submodule.txt: document default behavior

2019-02-11 Thread Denton Liu
This patch documents the default behavior of git-submodule if no subcommands are given, similar to how git-remote.txt documents it. Signed-off-by: Denton Liu --- Documentation/git-submodule.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/git-submodule.txt b/Documentation

Re: [PATCH 19/31] http-walker: replace sha1_to_hex

2019-02-11 Thread Eric Sunshine
On Mon, Feb 11, 2019 at 8:23 PM brian m. carlson wrote: > Since sha1_to_hex is limited to SHA-1, replace the uses of it in this > file with hasH_to_hex. Rename several variables accordingly to reflect s/hasH/hash/ > that they are no longer limited to SHA-1. > > Signed-off-by: brian m. carlson

Re: [PATCH 15/31] builtin/pull: make hash-size independent

2019-02-11 Thread Eric Sunshine
On Mon, Feb 11, 2019 at 8:23 PM brian m. carlson wrote: > Instead of using get_oid_hex and GIT_SHA1_HEXSZ, use parse_oid_hex to > avoid the need for a constant and simplify the code. > > Signed-off-by: brian m. carlson > --- > diff --git a/builtin/pull.c b/builtin/pull.c > @@ -365,9 +365,10 @@ st

Re: [PATCH 12/31] fast-import: make hash-size independent

2019-02-11 Thread Eric Sunshine
On Mon, Feb 11, 2019 at 8:23 PM brian m. carlson wrote: > Replace several uses of GIT_SHA1_HEXSZ and 40-based constants with > references to the_hash_algo. Update the note handling code here to > compute path sizes based on GIT_MAX_RAWSZ as well. > > Signed-off-by: brian m. carlson > --- > diff

Re: [PATCH 10/31] object-store: rename and expand packed_git's sha1 member

2019-02-11 Thread Eric Sunshine
On Mon, Feb 11, 2019 at 8:23 PM brian m. carlson wrote: > This member is used to represent the pack checksum of the pack in > question. Expand this member to be GIT_MAX_RAWSZ bytes in length so it > works with longer hashes and rename it to be "hash" instead of "sha1". > [...] > Signed-off-by: br

Re: What's cooking in git.git (Feb 2019, #02; Wed, 6)

2019-02-11 Thread Junio C Hamano
Rafael Ascensão writes: > On Thu, Feb 7, 2019 at 7:28 AM Junio C Hamano wrote: >> >> * du/branch-show-current (2018-10-26) 1 commit - branch: introduce >> --show-current display option >> >> "git branch" learned a new subcommand "--show-current". >> >> Will merge to 'next'. >> > > Did somethin

Good news

2019-02-11 Thread Johnny Koffi
ContractPayment201, Cod Swift: SCB / GH / IRD, A / C # 929/605/10456 AMOUNT # (10 milioane dolari) Referința noastră: SCB / IRD / CBX / 021/19 Standard Chartered Bank (PLC) din Accra Ghana. Din biroul domnului Johnny Koffi, Director regional al Standard Chartered Bank (PLC), Accra Ghana. Re: (

Re: [Proposed Fix] daemon.c: not initializing revents

2019-02-11 Thread Junio C Hamano
"Randall S. Becker" writes: >> In any case, no matter what POSIX says, if clearing .revents before > calling >> poll() helps on platforms in the real world, the patch is worth taking as > a fix, I >> would think. > > That's what my intent was - my explanations are suffering from a little > work-i

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

2019-02-11 Thread randall.s.becker
On February 11, 2019 20:18, Eric Sunshine wrote: > On Mon, Feb 11, 2019 at 7:37 PM Jeff King wrote: > > On Sat, Feb 09, 2019 at 09:05:04PM -0500, Eric Sunshine wrote: > > > On Sat, Feb 9, 2019 at 1:59 PM wrote: > > > > +generate_zero_bytes () { > > > > + perl -e 'if ($ARGV[0] == "infinity")

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

2019-02-11 Thread SZEDER Gábor
On Mon, Feb 11, 2019 at 07:44:33PM -0500, Jeff King wrote: > On Sat, Feb 09, 2019 at 03:06:05PM +0100, 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 GPGS

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

2019-02-11 Thread Junio C Hamano
"brian m. carlson" writes: > I've just sent a v4 with this squashed in. Whether you want to pick that > up or squash this into v3 is up to you. Let's take yours, as there is no point doing an eval for these two; for that matter, braces around ${i} are also pointless, but I'll let them pass. Tha

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

2019-02-11 Thread Junio C Hamano
Jeff King writes: > But it looks from the output like it just mentions every prereq that > wasn't satisfied. I don't think that's particularly useful to show for > all users, since most of them are platform things that cannot be changed > (and you'd never get the list to zero, since some of them

Re: [PATCH 08/31] notes: make hash size independent

2019-02-11 Thread brian m. carlson
On Mon, Feb 11, 2019 at 08:37:49PM -0500, Eric Sunshine wrote: > On Mon, Feb 11, 2019 at 8:23 PM brian m. carlson > wrote: > > diff --git a/notes.c b/notes.c > > @@ -527,15 +529,15 @@ static unsigned char determine_fanout(struct int_node > > *tree, unsigned char n, > > -/* hex SHA1 + 19 * '/' + N

Re: [PATCH 08/31] notes: make hash size independent

2019-02-11 Thread Eric Sunshine
On Mon, Feb 11, 2019 at 8:23 PM brian m. carlson wrote: > Switch out various uses of the GIT_SHA1_* constants with GIT_MAX_* > constants for allocations and the_hash_algo for general parsing. Update > a comment to no longer be SHA-1 specific. > > Signed-off-by: brian m. carlson > --- > diff --gi

[PATCH 29/31] read-cache: read data in a hash-independent way

2019-02-11 Thread brian m. carlson
Index entries are structured with a variety of fields up front, followed by a hash and one or two flags fields. Because the hash field is stored in the middle of the structure, it's difficult to use one fixed-size structure that easily allows access to the hash and flags fields. Adjust the structu

[PATCH 30/31] Git.pm: make hash size independent

2019-02-11 Thread brian m. carlson
The cat_blob function was matching on exactly 40 hex characters. This won't work with SHA-256, which uses 64-character hex object IDs. While it should be fine to simply match any number of hex characters since the output is space delimited, be extra safe by matching either exactly 40 or exactly 6

[PATCH 22/31] http: replace sha1_to_hex

2019-02-11 Thread brian m. carlson
Since sha1_to_hex is limited to SHA-1, replace it with hash_to_hex. Signed-off-by: brian m. carlson --- http.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/http.c b/http.c index 458d07fabb..8ab07458e4 100644 --- a/http.c +++ b/http.c @@ -2079,19 +2079,19 @@ in

[PATCH 19/31] http-walker: replace sha1_to_hex

2019-02-11 Thread brian m. carlson
Since sha1_to_hex is limited to SHA-1, replace the uses of it in this file with hasH_to_hex. Rename several variables accordingly to reflect that they are no longer limited to SHA-1. Signed-off-by: brian m. carlson --- http-walker.c | 18 +- 1 file changed, 9 insertions(+), 9 de

[PATCH 26/31] refspec: make hash size independent

2019-02-11 Thread brian m. carlson
Switch a use of GIT_SHA1_HEXSZ to use the_hash_algo. Signed-off-by: brian m. carlson --- refspec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/refspec.c b/refspec.c index f529092fd6..9a9bf21934 100644 --- a/refspec.c +++ b/refspec.c @@ -72,7 +72,7 @@ static int parse_refs

[PATCH 23/31] remote-curl: make hash size independent

2019-02-11 Thread brian m. carlson
Change one hard-coded use of the constant 40 to a reference to the_hash_algo. In addition, switch a use of get_oid_hex to parse_oid_hex to avoid the need to use a constant. Signed-off-by: brian m. carlson --- remote-curl.c | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff

[PATCH 25/31] archive: convert struct archiver_args to object_id

2019-02-11 Thread brian m. carlson
Change the commit_sha1 member to be called "commit_oid" and change it to be a pointer to struct object_id. Additionally, update two uses of GIT_SHA1_HEXSZ to use the_hash_algo instead. Signed-off-by: brian m. carlson --- archive-tar.c | 6 +++--- archive-zip.c | 10 +- archive.c |

[PATCH 17/31] http-backend: allow 64-character hex names

2019-02-11 Thread brian m. carlson
In an SHA-256-backed repository using the http-backend handler for dumb protocol clients, it may be necessary to access the raw packs using their full SHA-256-specified names. Allow packs and loose objects to be accessed using their full SHA-256-specified 64-character hex names. Signed-off-by: br

[PATCH 13/31] fast-import: replace sha1_to_hex

2019-02-11 Thread brian m. carlson
Replace the uses of sha1_to_hex in this function with hash_to_hex to allow the use of SHA-256 as well. Rename a variable since it is no longer limited to SHA-1. Signed-off-by: brian m. carlson --- fast-import.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fast-import.

[PATCH 28/31] dir: make untracked cache extension hash size independent

2019-02-11 Thread brian m. carlson
Instead of using a struct with a flex array member to read and write the untracked cache extension, use a shorter, fixed-length struct and add the name and hash data explicitly. Signed-off-by: brian m. carlson --- dir.c | 28 ++-- 1 file changed, 14 insertions(+), 14 dele

[PATCH 04/31] pack-bitmap: replace sha1_to_hex

2019-02-11 Thread brian m. carlson
Replace the uses of sha1_to_hex in the pack bitmap code with hash_to_hex to allow the use of SHA-256 as well. Rename a few variables since they are no longer limited to SHA-1. Signed-off-by: brian m. carlson --- pack-bitmap-write.c | 6 +++--- pack-bitmap.c | 8 2 files changed,

[PATCH 18/31] http-push: remove remaining uses of sha1_to_hex

2019-02-11 Thread brian m. carlson
Since sha1_to_hex is limited to SHA-1, switch all remaining uses of it in this file to hash_to_hex or oid_to_hex. Modify update_remote to take a pointer to struct object_id, and since we don't modify that parameter in the function, set it to be const as well. Signed-off-by: brian m. carlson ---

[PATCH 31/31] gitweb: make hash size independent

2019-02-11 Thread brian m. carlson
Gitweb has several hard-coded 40 values throughout it to check for values that are passed in or acquired from Git. To simplify the code, introduce a regex variable that matches either exactly 40 or exactly 64 hex characters, and use this variable anywhere we would have previously hard-coded a 40 i

[PATCH 21/31] http: compute hash of downloaded objects using the_hash_algo

2019-02-11 Thread brian m. carlson
Signed-off-by: brian m. carlson --- http.c | 10 +- http.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/http.c b/http.c index 993ddc956a..458d07fabb 100644 --- a/http.c +++ b/http.c @@ -2337,8 +2337,8 @@ static size_t fwrite_sha1_file(char *ptr, size_t eltsize,

[PATCH 24/31] archive-tar: make hash size independent

2019-02-11 Thread brian m. carlson
Make the tar generation code hash size independent by using the_hash_algo. Make the tar parsing code compute the header value based on the hash algorithm in use. Update a variable name and switch to hash_to_hex. Signed-off-by: brian m. carlson --- archive-tar.c | 7 --- built

[PATCH 12/31] fast-import: make hash-size independent

2019-02-11 Thread brian m. carlson
Replace several uses of GIT_SHA1_HEXSZ and 40-based constants with references to the_hash_algo. Update the note handling code here to compute path sizes based on GIT_MAX_RAWSZ as well. Signed-off-by: brian m. carlson --- fast-import.c | 27 +++ 1 file changed, 15 inserti

[PATCH 08/31] notes: make hash size independent

2019-02-11 Thread brian m. carlson
Switch out various uses of the GIT_SHA1_* constants with GIT_MAX_* constants for allocations and the_hash_algo for general parsing. Update a comment to no longer be SHA-1 specific. Signed-off-by: brian m. carlson --- notes.c | 32 +--- 1 file changed, 17 insertions(+

[PATCH 20/31] http: replace hard-coded constant with the_hash_algo

2019-02-11 Thread brian m. carlson
Replace a hard-coded 40 with a reference to the_hash_algo. Signed-off-by: brian m. carlson --- http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/http.c b/http.c index a09adc518f..993ddc956a 100644 --- a/http.c +++ b/http.c @@ -2065,7 +2065,7 @@ int http_fetch_ref(const c

[PATCH 06/31] submodule: avoid hard-coded constants

2019-02-11 Thread brian m. carlson
Instead of using hard-coded 40-based constants, express these values in terms of the_hash_algo and GIT_MAX_HEXSZ. Signed-off-by: brian m. carlson --- merge-recursive.c | 2 +- submodule.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/merge-recursive.c b/merge-recur

[PATCH 05/31] pack-bitmap: switch hard-coded constants to the_hash_algo

2019-02-11 Thread brian m. carlson
Switch two hard-coded uses of 20 to references to the_hash_algo. Signed-off-by: brian m. carlson --- pack-bitmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pack-bitmap.c b/pack-bitmap.c index 6d6fa68563..603492c237 100644 --- a/pack-bitmap.c +++ b/pack-bitmap.c @@

[PATCH 16/31] http-push: convert to use the_hash_algo

2019-02-11 Thread brian m. carlson
Switch the lock token code to use the_hash_algo and increase its buffers to be allocated using GIT_MAX_* constants. Update the parsing of object paths to use the_hash_algo as well. Signed-off-by: brian m. carlson --- http-push.c | 20 ++-- 1 file changed, 10 insertions(+), 10 de

[PATCH 27/31] builtin/difftool: use parse_oid_hex

2019-02-11 Thread brian m. carlson
Instead of using get_oid_hex and adding constants to the result, use parse_oid_hex to make this code independent of the hash size. Signed-off-by: brian m. carlson --- builtin/difftool.c | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/builtin/difftool.c b/builtin/difftoo

[PATCH 07/31] notes-merge: switch to use the_hash_algo

2019-02-11 Thread brian m. carlson
Switch from using GIT_SHA1_HEXSZ to GIT_MAX_HEXSZ and the_hash_algo so that the code works with any hash algorithm. Signed-off-by: brian m. carlson --- notes-merge.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/notes-merge.c b/notes-merge.c index 280aa8e6c1..2fe724f1

[PATCH 03/31] pack-bitmap: convert struct stored_bitmap to object_id

2019-02-11 Thread brian m. carlson
Convert struct stored_bitmap to use struct object_id. Signed-off-by: brian m. carlson --- pack-bitmap.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pack-bitmap.c b/pack-bitmap.c index b53f37243c..c760913cea 100644 --- a/pack-bitmap.c +++ b/pack-bitmap.c @@ -18,7 +

[PATCH 15/31] builtin/pull: make hash-size independent

2019-02-11 Thread brian m. carlson
Instead of using get_oid_hex and GIT_SHA1_HEXSZ, use parse_oid_hex to avoid the need for a constant and simplify the code. Signed-off-by: brian m. carlson --- builtin/pull.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/builtin/pull.c b/builtin/pull.c index 701d1473dc.

[PATCH 14/31] builtin/am: make hash size independent

2019-02-11 Thread brian m. carlson
Instead of using GIT_SHA1_HEXSZ, switch to using the_hash_algo and parse_oid_hex to parse the lines involved in rebasing notes. Signed-off-by: brian m. carlson --- builtin/am.c | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/builtin/am.c b/builtin/am.c index 58a2aef2

[PATCH 11/31] builtin/name-rev: make hash-size independent

2019-02-11 Thread brian m. carlson
Use the_hash_algo when parsing instead of GIT_SHA1_HEXSZ so that this function works with any size hash. Rename the variable forty to counter, as this is a better name and is independent of the hash size. Signed-off-by: brian m. carlson --- builtin/name-rev.c | 14 -- 1 file changed

[PATCH 09/31] notes: replace sha1_to_hex

2019-02-11 Thread brian m. carlson
Replace the uses of sha1_to_hex in this function with hash_to_hex to allow the use of SHA-256 as well. Rename some variables since this code is no longer limited to SHA-1. Signed-off-by: brian m. carlson --- notes.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git

[PATCH 10/31] object-store: rename and expand packed_git's sha1 member

2019-02-11 Thread brian m. carlson
This member is used to represent the pack checksum of the pack in question. Expand this member to be GIT_MAX_RAWSZ bytes in length so it works with longer hashes and rename it to be "hash" instead of "sha1". This transformation was made with a change to the definition and the following semantic pa

[PATCH 02/31] pack-bitmap: make bitmap header handling hash agnostic

2019-02-11 Thread brian m. carlson
Increase the checksum field in struct bitmap_disk_header to be GIT_MAX_RAWSZ bytes in length and ensure that we hash the proper number of bytes out when computing the bitmap checksum. Signed-off-by: brian m. carlson --- pack-bitmap-write.c | 2 +- pack-bitmap.c | 2 +- pack-bitmap.h

[PATCH 00/31] Hash function transition part 16

2019-02-11 Thread brian m. carlson
This is the sixteenth series of hash function transition patches. This series contains various fixes, mostly focused around the pack bitmap code, the HTTP code, the archive code, the index, and parts of our Perl code. This is the second to last series required for a "stage 0" Git; that is, one tha

[PATCH 01/31] t/lib-submodule-update: use appropriate length constant

2019-02-11 Thread brian m. carlson
Instead of using a specific invalid hard-coded object ID, produce one of the appropriate length by using test_oid. Signed-off-by: brian m. carlson --- t/lib-submodule-update.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/lib-submodule-update.sh b/t/lib-submodule-updat

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

2019-02-11 Thread Eric Sunshine
On Mon, Feb 11, 2019 at 7:37 PM Jeff King wrote: > On Sat, Feb 09, 2019 at 09:05:04PM -0500, Eric Sunshine wrote: > > On Sat, Feb 9, 2019 at 1:59 PM wrote: > > > +generate_zero_bytes () { > > > + perl -e 'if ($ARGV[0] == "infinity") { > > > > s/perl/"$PERL_PATH"/ > > This shouldn't be neces

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

2019-02-11 Thread brian m. carlson
On Mon, Feb 11, 2019 at 04:31:00PM -0800, Junio C Hamano wrote: > "brian m. carlson" writes: > > >> - cat lf.utf8.raw | iconv -f UTF-8 -t UTF-${i} >lf.utf${i}.raw && > >> - cat crlf.utf8.raw | iconv -f UTF-8 -t UTF-${i} >crlf.utf${i}.raw && > >> + cat lf.utf8.raw | eval "write_u

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

2019-02-11 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

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

2019-02-11 Thread Jeff King
On Sat, Feb 09, 2019 at 03:06:05PM +0100, 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 pr

Re: Confusion about the PACK format

2019-02-11 Thread Jeff King
On Sun, Feb 10, 2019 at 07:35:38PM +, Ramsay Jones wrote: > > Now, the 'n-byte type and length' is a variable length encoding of > > the object type and length. The number of bytes used to encode this > > data is content dependant. If the top bit of a byte is set, then we > > need to process t

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

2019-02-11 Thread Jeff King
On Sat, Feb 09, 2019 at 09:05:04PM -0500, Eric Sunshine wrote: > 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 >

Re: [Breakage] 2.20.0-rc0 t1404: test_i18ngrep reports 1 instead of 0 on NonStop in one case

2019-02-11 Thread Jeff King
On Mon, Feb 11, 2019 at 04:32:52PM -0800, Junio C Hamano wrote: > Jeff King writes: > > > Hmm. We care to _some_ degree, since that's the condition we set up for > > making sure that update-ref cannot take the lock. But it would probably > > be fine to just confirm that we failed to take the loc

Re: [PATCH] test-lib: fix non-portable pattern bracket expressions

2019-02-11 Thread Jeff King
On Tue, Feb 12, 2019 at 01:30:18AM +0100, SZEDER Gábor wrote: > > I learn > > another one. :) Thanks for fixing this, and for digging up the POSIX > > reference. > > I had to, that 16.04's dash worked, but neither dash in older LTS nor > newer upstream version did was particularly puzzling. Turn

Re: [GSoC] Microproject on git-credential-cache

2019-02-11 Thread Jeff King
On Mon, Feb 11, 2019 at 10:23:25PM -0200, Matheus Tavares Bernardino wrote: > > > For the microproject "Add configuration options for some commonly used > > > command-line options", are there some options already known to be good > > > for adding to configuration file? > > > > Hmm. I don't offhand

Re: [Breakage] 2.20.0-rc0 t1404: test_i18ngrep reports 1 instead of 0 on NonStop in one case

2019-02-11 Thread Junio C Hamano
Jeff King writes: > Hmm. We care to _some_ degree, since that's the condition we set up for > making sure that update-ref cannot take the lock. But it would probably > be fine to just confirm that we failed to take the lock. And there, > checking for just "Unable to create $Q.*packed-refs.lock" w

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

2019-02-11 Thread Junio C Hamano
"brian m. carlson" writes: >> - cat lf.utf8.raw | iconv -f UTF-8 -t UTF-${i} >lf.utf${i}.raw && >> - cat crlf.utf8.raw | iconv -f UTF-8 -t UTF-${i} >crlf.utf${i}.raw && >> + cat lf.utf8.raw | eval "write_utf${i}" >lf.utf${i}.raw && >> + cat crlf.utf8.raw | eval "write_utf$

Re: [PATCH] test-lib: fix non-portable pattern bracket expressions

2019-02-11 Thread SZEDER Gábor
On Mon, Feb 11, 2019 at 06:46:26PM -0500, Jeff King wrote: > On Mon, Feb 11, 2019 at 08:58:03PM +0100, SZEDER Gábor wrote: > > > Use a '!' character to start a non-matching pattern bracket > > expression, as specified by POSIX in Shell Command Language section > > 2.13.1 Patterns Matching a Single

Re: [PATCH] git-gui: Handle Ctrl+BS & Ctrl+Del in the commit msg

2019-02-11 Thread brian m. carlson
On Mon, Feb 11, 2019 at 10:42:03PM +0100, Ismael Luceno wrote: > Signed-off-by: Ismael Luceno > --- > git-gui.sh | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/git-gui.sh b/git-gui.sh > index 5bc21b878d41..e00d9a345294 100755 > --- a/git-gui.sh > +++ b/git-gui.sh > @@ -3788,6 +3788,8

Re: [GSoC] Microproject on git-credential-cache

2019-02-11 Thread Matheus Tavares Bernardino
On Mon, Feb 11, 2019 at 10:09 PM Christian Couder wrote: > > Hi, > > On Tue, Feb 12, 2019 at 12:48 AM Matheus Tavares Bernardino > wrote: > > > > Hi, everyone > > > > I've been contributing to the Linux Kernel for the past semester and > > I'm now looking to take my first steps in the git communi

Re: [Breakage] 2.20.0-rc0 t1404: test_i18ngrep reports 1 instead of 0 on NonStop in one case

2019-02-11 Thread Jeff King
On Mon, Feb 11, 2019 at 01:07:15PM -0800, Junio C Hamano wrote: > >> test_i18ngrep "Unable to create $Q.*packed-refs.lock$Q: File exists" err > > > > The message does not match, does it? Here we grep for "File exists" > > but the message you showed says "File already exists". > > Hmph, this is fr

Re: [GSoC] Microproject on git-credential-cache

2019-02-11 Thread Matheus Tavares Bernardino
On Mon, Feb 11, 2019 at 10:00 PM Jeff King wrote: > > On Mon, Feb 11, 2019 at 09:45:21PM -0200, Matheus Tavares Bernardino wrote: > > > I've been contributing to the Linux Kernel for the past semester and > > I'm now looking to take my first steps in the git community. I'm also > > interested in G

Re: [GSoC] Microproject on git-credential-cache

2019-02-11 Thread Christian Couder
Hi, On Tue, Feb 12, 2019 at 12:48 AM Matheus Tavares Bernardino wrote: > > Hi, everyone > > I've been contributing to the Linux Kernel for the past semester and > I'm now looking to take my first steps in the git community. I'm also > interested in GSoC 2019. Thanks for your interest in Git! >

Re: [PATCH] protocol-capabilities.txt: document symref

2019-02-11 Thread Josh Steadmon
On 2019.02.11 19:05, Jeff King wrote: > On Mon, Feb 11, 2019 at 03:52:24PM -0800, Josh Steadmon wrote: > > > In 7171d8c15f ("upload-pack: send symbolic ref information as > > capability"), we added a symref capability to the pack protocol, but it > > was never documented. Adapt the patch notes fro

Re: [PATCH] protocol-capabilities.txt: document symref

2019-02-11 Thread Jeff King
On Mon, Feb 11, 2019 at 03:52:24PM -0800, Josh Steadmon wrote: > In 7171d8c15f ("upload-pack: send symbolic ref information as > capability"), we added a symref capability to the pack protocol, but it > was never documented. Adapt the patch notes from that commit and add > them to the capabilities

Re: [GSoC] Microproject on git-credential-cache

2019-02-11 Thread Jeff King
On Mon, Feb 11, 2019 at 09:45:21PM -0200, Matheus Tavares Bernardino wrote: > I've been contributing to the Linux Kernel for the past semester and > I'm now looking to take my first steps in the git community. I'm also > interested in GSoC 2019. Hi, and welcome! > I started looking at https://gi

Re: [PATCH] protocol-capabilities.txt: document symref

2019-02-11 Thread Jonathan Nieder
Josh Steadmon wrote: > In 7171d8c15f ("upload-pack: send symbolic ref information as > capability"), we added a symref capability to the pack protocol, but it > was never documented. Adapt the patch notes from that commit and add > them to the capabilities documentation. > > Signed-off-by: Josh St

Re: GSoC 2019: Git's application submitted

2019-02-11 Thread Christian Couder
On Mon, Feb 11, 2019 at 11:18 PM Thomas Gummerer wrote: > > On 02/11, Christian Couder wrote: > > Historically though we have always been very optimistic in what we > > thought a student could accomplish in a GSoC. And we are very likely > > to find more ideas for improvements during the GSoC, in

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

2019-02-11 Thread brian m. carlson
On Mon, Feb 11, 2019 at 10:43:06PM +0100, Kevin Daudt wrote: > With some additional fixes, this indeed does solve the issue for Alpine > Linux, thanks. > > I had to fix the following as well: > > iff --git a/t/t0028-working-tree-encoding.sh > b/t/t0028-working-tree-encoding.sh > index 8936ba6757

[PATCH] protocol-capabilities.txt: document symref

2019-02-11 Thread Josh Steadmon
In 7171d8c15f ("upload-pack: send symbolic ref information as capability"), we added a symref capability to the pack protocol, but it was never documented. Adapt the patch notes from that commit and add them to the capabilities documentation. Signed-off-by: Josh Steadmon --- Documentation/techni

BUG: git worktree add directory-path fails due to over-aggressive disallowing of worktrees with same suffix

2019-02-11 Thread Cameron Gunnin
The bug: git init worktree-test-repo git --git-dir=worktree-test-repo/.git commit --allow-empty -m "first commit" git --git-dir=worktree-test-repo/.git branch branch1 git --git-dir=worktree-test-repo/.git branch branch2 mkdir unique-path-1 unique-path-2 cd unique-path-1 git --git-dir=

Re: [PATCH] test-lib: fix non-portable pattern bracket expressions

2019-02-11 Thread Jeff King
On Mon, Feb 11, 2019 at 08:58:03PM +0100, SZEDER Gábor wrote: > Use a '!' character to start a non-matching pattern bracket > expression, as specified by POSIX in Shell Command Language section > 2.13.1 Patterns Matching a Single Character [1]. Just when I think I know every little gotcha in the

[GSoC] Microproject on git-credential-cache

2019-02-11 Thread Matheus Tavares Bernardino
Hi, everyone I've been contributing to the Linux Kernel for the past semester and I'm now looking to take my first steps in the git community. I'm also interested in GSoC 2019. I started looking at https://git.github.io/SoC-2019-Microprojects/ and one that got my attention was "Move ~/.git-creden

Re: What's cooking in git.git (Feb 2019, #02; Wed, 6)

2019-02-11 Thread Rafael Ascensão
On Thu, Feb 7, 2019 at 7:28 AM Junio C Hamano wrote: > > * du/branch-show-current (2018-10-26) 1 commit - branch: introduce > --show-current display option > > "git branch" learned a new subcommand "--show-current". > > Will merge to 'next'. > Did something change? I may have missed it. Until l

Re: [PATCH 1/1] fixup! trace2: collect Windows-specific process information

2019-02-11 Thread Junio C Hamano
"Jeff Hostetler via GitGitGadget" writes: > From: Jeff Hostetler > > Guard against infinite loop while computing the parent process hierarchy. > > CreateToolhelp32Snapshot() is used to get a list of all processes on the > system. Each process entry contains the process PID and PPID (alive at th

Fwd: git commit --verbose shows incorrect diff when pre-commit hook is used to modify files

2019-02-11 Thread Sergey Lukashev
Пересылаемое сообщение 12.02.2019, 01:54, "Sergey Lukashev" : Indeed. Sorry, this was how I thought it works. So the hook runs even if the commit is cancelled. A bit odd. Then let's have someone else from git list to answer your question. 12.02.2019, 01:11, "Fernando Chorne

Re: [PATCH] t0028: fix wrong octal values for BOM in setup

2019-02-11 Thread Junio C Hamano
Kevin Daudt writes: > The setup code uses octal values with printf to generate a BOM for > UTF-16/32 BE/LE. It specifically uses '\777' to emit a 0xff byte. This > relies on the fact that most shells truncate the value above 0o377. > > Ash however interprets '\777' as '\77' + a literal '7', resul

Re: [PATCH] test-lib: fix non-portable pattern bracket expressions

2019-02-11 Thread Junio C Hamano
SZEDER Gábor writes: > Use a '!' character to start a non-matching pattern bracket > expression, as specified by POSIX in Shell Command Language section > 2.13.1 Patterns Matching a Single Character [1]. > > I used '^' instead in three places in the previous three commits, to Ah, thanks for catc

Re: GSoC 2019: Git's application submitted

2019-02-11 Thread Thomas Gummerer
On 02/11, Christian Couder wrote: > On Thu, Feb 7, 2019 at 10:33 PM Thomas Gummerer wrote: > > > > On 02/07, Johannes Schindelin wrote: > > > On Wed, 6 Feb 2019, Thomas Gummerer wrote: > > > > - implement pushing/poping conflicted state > > > > > > > >This would obviously be the end goal. > >

Re: git commit --verbose shows incorrect diff when pre-commit hook is used to modify files

2019-02-11 Thread Sergey Lukashev
At the time you see the diff the committing of changes has not yet been initiated. It's only after you type in the message that the ACTUAL committing starts and the hook runs. You can print the diff of what your hook has changed by running "git diff" in it before adding changes. 12.02.2019, 00

[PATCH] git-gui: Handle Ctrl+BS & Ctrl+Del in the commit msg

2019-02-11 Thread Ismael Luceno
Signed-off-by: Ismael Luceno --- git-gui.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/git-gui.sh b/git-gui.sh index 5bc21b878d41..e00d9a345294 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -3788,6 +3788,8 @@ bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context;break} bind $ui_comm

[PATCH] git-gui: Implement color configuration

2019-02-11 Thread Ismael Luceno
Signed-off-by: Ismael Luceno --- git-gui.sh | 33 ++--- lib/option.tcl | 16 2 files changed, 38 insertions(+), 11 deletions(-) diff --git a/git-gui.sh b/git-gui.sh index e00d9a345294..01e5462dc70e 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -903,

RE: [Breakage] 2.20.0-rc0 t1404: test_i18ngrep reports 1 instead of 0 on NonStop in one case

2019-02-11 Thread Randall S. Becker
On February 11, 2019 16:07, Junio C Hamano wrote: > Duy Nguyen writes: > > > On Mon, Feb 11, 2019 at 2:09 AM Randall S. Becker > > wrote: > >> > >> Hi All, > >> > >> I tracked down a breakage in t1404 subtest 52. The line > >> > >> test_i18ngrep "Unable to create $Q.*packed-refs.lock$Q: File exi

RE: [Proposed Fix] daemon.c: not initializing revents

2019-02-11 Thread Randall S. Becker
On February 11, 2019 15:57, Junio C Hamano wrote: > "Randall S. Becker" writes: > > > 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 ha

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

2019-02-11 Thread Kevin Daudt
On Mon, Feb 11, 2019 at 01:26:39AM +, brian m. carlson wrote: > 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 fo

[PATCH] t0028: fix wrong octal values for BOM in setup

2019-02-11 Thread Kevin Daudt
The setup code uses octal values with printf to generate a BOM for UTF-16/32 BE/LE. It specifically uses '\777' to emit a 0xff byte. This relies on the fact that most shells truncate the value above 0o377. Ash however interprets '\777' as '\77' + a literal '7', resulting in an invalid BOM. Fix th

git commit --verbose shows incorrect diff when pre-commit hook is used to modify files

2019-02-11 Thread Fernando Chorney
Hi, I am trying to use a pre-commit hook to modify files before they are to be committed. The problem I am running into is that if I use "git commit --verbose", which I often do so that I can see the diff, the diff it displays in the editor is the diff before the pre-commit hook was run rather tha

Re: [PATCH] sequencer: make sign_off_header a file local symbol

2019-02-11 Thread Junio C Hamano
Ramsay Jones writes: > This has been hanging around for a while. I sent it to the list last > time in [1], but it seems to have been dropped. (Found while attempting > to rebase loads of old branches to a newer base!) Thanks. Will apply.

Re: [Breakage] 2.20.0-rc0 t1404: test_i18ngrep reports 1 instead of 0 on NonStop in one case

2019-02-11 Thread Junio C Hamano
Duy Nguyen writes: > On Mon, Feb 11, 2019 at 2:09 AM Randall S. Becker > wrote: >> >> Hi All, >> >> I tracked down a breakage in t1404 subtest 52. The line >> >> test_i18ngrep "Unable to create $Q.*packed-refs.lock$Q: File exists" err > > The message does not match, does it? Here we grep for "Fi

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

2019-02-11 Thread Junio C Hamano
randall.s.bec...@rogers.com writes: > 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

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

2019-02-11 Thread Junio C Hamano
Jean-Noël Avila writes: > On 11 février 2019, Jiang Xin wrote: > >> Jean-Noël Avila 于2019年2月11日周一 下午2:48写道: >>> Signed-off-by: Jean-Noël Avila >>> --- >>> builtin/bisect--helper.c | 4 ++-- >>> builtin/fetch.c | 2 +- >>> builtin/rebase.c | 2 +- >>> 3 files changed, 4 inserti

Re: [Proposed Fix] daemon.c: not initializing revents

2019-02-11 Thread Junio C Hamano
"Randall S. Becker" writes: > 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. > > Ac

Re: [PATCH 8/8] remote-curl: in v2, fill credentials if needed

2019-02-11 Thread Jeff King
On Mon, Feb 11, 2019 at 11:20:54AM -0800, Jonathan Tan wrote: > > In the case of proxy_request(), we don't know ahead of time whether the > > request is large or not; we just proxy the data through. And we don't do > > the probe thing at all. So wouldn't we dropping some data for the > > follow-up

  1   2   >