[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 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 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 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 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 |

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

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 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 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 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 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: [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

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: 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

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: [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 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 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

[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

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.

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

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,

[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 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

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

<    1   2