Re: [PATCH 2/2] format-patch: add an option to suppress commit hash

he distant future. I'll reroll with the change you suggested. I might drop in another patch to improve the existing tests to cover the case without this option, as I think we just look for "From " currently. -- brian m. carlson / brian with sandals: Houston, Texas, US +1 832 623 2791 | ht

Re: GPG public keys

and tarballs. I can't personally vouch for the human behind the signatures, but when building git from tarballs, I do check that the same key signed them. -- brian m. carlson / brian with sandals: Houston, Texas, US +1 832 623 2791 | https://www.crustytoothpaste.net/~bmc | My opinion only OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187 signature.asc Description: PGP signature

Re: [PATCH v2 0/3] format-patch: introduce option to suppress commit hashes

reroll with the other suggested changes and a slight tweak to make the tests less dependent on the history in both cases. -- brian m. carlson / brian with sandals: Houston, Texas, US +1 832 623 2791 | https://www.crustytoothpaste.net/~bmc | My opinion only OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A99

[PATCH v3 2/3] format-patch: add an option to suppress commit hash

to avoid this diff noise. Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- Documentation/git-format-patch.txt | 4 builtin/log.c | 5 + log-tree.c | 3 ++- revision.h | 1 + t/t4014-format-pa

[PATCH v3 0/3] format-patch: introduce option to suppress commit hashes

* Improve the tests to be more idiomatic and avoid hard-coding line counts. brian m. carlson (3): Introduce a null_oid constant. format-patch: add an option to suppress commit hash format-patch: check that header line has expected format Documentation/git-format-patch.txt | 4 bui

[PATCH v3 1/3] Introduce a null_oid constant.

null_oid is the struct object_id equivalent to null_sha1. Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- cache.h | 1 + sha1_file.c | 1 + 2 files changed, 2 insertions(+) diff --git a/cache.h b/cache.h index 5ab6cb50..c63fcc11 100644 --- a/cache.h +++ b/c

[PATCH v3 3/3] format-patch: check that header line has expected format

The format of the "From " header line is very specific to allow utilities to detect Git-style patches. Add a test that the patches created are in the expected format. Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- t/t4014-format-patch.sh | 7 +++ 1

[PATCH v2 1/3] Introduce a null_oid constant.

null_oid is the struct object_id equivalent to null_sha1. Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- cache.h | 1 + sha1_file.c | 1 + 2 files changed, 2 insertions(+) diff --git a/cache.h b/cache.h index 5ab6cb50..c63fcc11 100644 --- a/cache.h +++ b/c

[PATCH v2 0/3] format-patch: introduce option to suppress commit hashes

: * Rename the option --zero-commit. * Improve the tests to look for a 40-hex hash value in "From " header. brian m. carlson (3): Introduce a null_oid constant. format-patch: add an option to suppress commit hash format-patch: check that header line has expected format Docu

[PATCH v2 3/3] format-patch: check that header line has expected format

The format of the "From " header line is very specific to allow utilities to detect Git-style patches. Add a test that the patches created are in the expected format. Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- t/t4014-format-patch.sh | 6 ++ 1

[PATCH v2 2/3] format-patch: add an option to suppress commit hash

to avoid this diff noise. Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- Documentation/git-format-patch.txt | 4 builtin/log.c | 5 + log-tree.c | 3 ++- revision.h | 1 + t/t4014-format-pa

Re: query regarding git merge

the other, it will be preserved in the merge. So in your case, you deleted a.txt on one side and did not modify it on the other. Git applied that change to the result of the merge. Git has no way of knowing that a.txt is still required in the result. This is a very common question that comes up

Re: query regarding git merge

at the merge didn't go the way you wanted, you can either add a follow-up commit, or you can do "git commit --amend" on the merge after making the necessary changes. In such a case, it may be useful to add a note to the commit message stating that you modified it from the original merge

Re: [PATCH/RFC 0/2] add a perl compatible regex match flag to git describe

tion glob in the --matches help text > describe: add --pcre-match option If you're going to implement this, I'd recommend an option that adjusts --matches to accept a PCRE regexp instead of adding a new option accepting its own pattern. I'd also recommend calling it --perl-regexp for compatibil

Re: What's cooking in git.git (Nov 2015, #04; Tue, 24)

On Sat, Nov 28, 2015 at 11:35:43AM -0500, Jeff King wrote: > On Sat, Nov 28, 2015 at 03:40:10PM +0000, brian m. carlson wrote: > > > On Tue, Nov 24, 2015 at 08:07:23PM -0500, Jeff King wrote: > > > What's cooking in git.git (N

Re: What's cooking in git.git (Nov 2015, #04; Tue, 24)

a reroll? -- brian m. carlson / brian with sandals: Houston, Texas, US +1 832 623 2791 | https://www.crustytoothpaste.net/~bmc | My opinion only OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187 signature.asc Description: PGP signature

Re: [PATCH v4 09/12] Add several uses of get_object_hash.

On Fri, Nov 20, 2015 at 06:38:30AM -0500, Jeff King wrote: > On Tue, Nov 10, 2015 at 02:22:27AM +0000, brian m. carlson wrote: > > > diff --git a/patch-ids.c b/patch-ids.c > > index bf81b923..83229a0d 100644 > > --- a/patch-ids.c > > +++ b/patch-ids.c &g

Coccinelle for automated refactors

ill accept responsibility for the content of the patches. If there's interest, I can send a patch with a set of basic object_id transforms to make it easier for others to make those changes when they're doing work elsewhere in the codebase. [0] http://coccinelle.lip6.fr/ -- brian m. carlson / br

Re: [PATCH 1/8] Add basic Coccinelle transforms.

On Mon, Jun 06, 2016 at 07:28:28PM -0700, Junio C Hamano wrote: > "brian m. carlson" <sand...@crustytoothpaste.net> writes: > > > Coccinelle (http://coccinelle.lip6.fr/) is a program which performs > > mechanical transformations on C programs using semantic pa

Re: [PATCH 4/8] Rename struct diff_filespec's sha1_valid member.

gt; +pair->one->oid_valid = !is_null_oid(>parent[i].oid); > >> > >> Is this transformation correct? > > > > Or the oidcpy() above it, which was introduced in patch 3. > > Indeed these look wrong. Yes, those do look wrong. I'll figure o

Re: Coccinelle for automated refactors

might have done incidentally as part of the patch, but could defensibly be done in a second patch anyway. My goal is to make the series as much like a human-edited series as possible, but with less work on all sides. I can send an RFC series that demonstrates this a little later to see if it's an a

[PATCH 6/8] merge-recursive: convert struct merge_file_info to object_id

ed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- merge-recursive.c | 39 --- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index a07050cd..bc455491 100644 --- a/merge-recursive.c

[PATCH 5/8] merge-recursive: convert struct stage_data to use object_id

struct stage_data o; expression E1; @@ - o.stages[E1].sha + o.stages[E1].oid.hash Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- merge-recursive.c | 38 ++ 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/merge-recursi

[PATCH 7/8] merge-recursive: convert leaf functions to use struct object_id

Convert all but two of the static functions in this file to use struct object_id. Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- merge-recursive.c | 236 +++--- 1 file changed, 118 insertions(+), 118 deletions(-) diff

[RFC][PATCH 0/8] struct object_id, Part 4

are of course welcomed. The testsuite continues to pass at each step. brian m. carlson (8): Add basic Coccinelle transforms. Apply standard object_id Coccinelle transformations. Convert struct diff_filespec to struct object_id Rename struct diff_filespec's sha1_valid member. merge

[PATCH 4/8] Rename struct diff_filespec's sha1_valid member.

; @@ - p->sha1_valid + p->oid_valid @@ struct diff_filespec o; @@ - o.sha1_valid + o.oid_valid Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- combine-diff.c| 4 ++-- diff.c| 28 ++-- diffcore-break.c | 2 +- diffcor

[PATCH 3/8] Convert struct diff_filespec to struct object_id

diff_filespec o; @@ - o.sha1 + o.oid.hash Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- builtin/blame.c | 6 +-- builtin/fast-export.c | 10 ++--- builtin/reset.c | 4 +- combine-diff.c| 10 ++--- diff.c| 69 +---

[PATCH 2/8] Apply standard object_id Coccinelle transformations.

Apply the standard set of semantic patches to convert some leftover places using struct object_id's hash member to instead use the wrapper functions that take struct object_id natively. Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- bisect.c | 2 +- b

[PATCH 1/8] Add basic Coccinelle transforms.

to the struct object_id transformation. Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- I realize the name and location of this file might be suboptimal. Suggestions on better locations and filenames would be appreciated. standard.cocc

[PATCH 8/8] merge-recursive: convert merge_recursive_generic to object_id

Convert this function and the git merge-recursive subcommand to use struct object_id. Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- builtin/merge-recursive.c | 20 ++-- merge-recursive.c | 14 +++--- merge-recursive.h | 6 +++

Re: [PATCH v2 0/8] object_id part 4

On Tue, Jun 21, 2016 at 02:22:50PM -0700, Junio C Hamano wrote: > "brian m. carlson" <sand...@crustytoothpaste.net> writes: > > > This series is part 4 in a series of conversions to replace instances of > > unsigned char [20] with struct object_id. Most of

Re: [PATCH v2 0/8] object_id part 4

truct assignment was less desirable. Also, if we do struct assignment, if we add a new hash, we may copy more than necessary (e.g. 64 bytes when we're only using SHA-1); however, this may be offset by the ability of the compiler to compute the offset at compile time. -- brian m. carlson / brian with sandals: Houston, Texas, US +1 832 623 2791 | https://www.crustytoothpaste.net/~bmc | My opinion only OpenPGP: https://keybase.io/bk2204 signature.asc Description: PGP signature

[PATCH v2 8/8] merge-recursive: convert merge_recursive_generic to object_id

Convert this function and the git merge-recursive subcommand to use struct object_id. Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- builtin/merge-recursive.c | 20 ++-- merge-recursive.c | 14 +++--- merge-recursive.h | 6 +++

[PATCH v2 1/8] Add basic Coccinelle transforms.

to the struct object_id transformation, as well as a README. Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- contrib/examples/coccinelle/README | 2 + contrib/examples/coccinelle/object_id.cocci | 83 + 2 files changed, 85 inse

[PATCH v2 7/8] merge-recursive: convert leaf functions to use struct object_id

Convert all but two of the static functions in this file to use struct object_id. Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- merge-recursive.c | 236 +++--- 1 file changed, 118 insertions(+), 118 deletions(-) diff

[PATCH v2 3/8] Convert struct diff_filespec to struct object_id

ilespec *p; @@ - p->sha1 + p->oid.hash Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- builtin/blame.c | 6 +-- builtin/fast-export.c | 10 ++--- builtin/reset.c | 4 +- combine-diff.c| 10 ++--- diff.c| 69 +---

[PATCH v2 4/8] Rename struct diff_filespec's sha1_valid member.

o; @@ - o.sha1_valid + o.oid_valid @@ struct diff_filespec *p; @@ - p->sha1_valid + p->oid_valid Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- combine-diff.c| 4 ++-- diff.c| 28 ++-- diffcore-break.c | 2 +- diffcor

[PATCH v2 5/8] merge-recursive: convert struct stage_data to use object_id

stage_data *p; expression E1; @@ - p->stages[E1].sha + p->stages[E1].oid.hash Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- merge-recursive.c | 38 ++ 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/merge-recursi

[PATCH v2 0/8] object_id part 4

plain structs before pointers to structs to avoid misconversions. This addresses the issue that Peff caught originally. brian m. carlson (8): Add basic Coccinelle transforms. Apply object_id Coccinelle transformations. Convert struct diff_filespec to struct object_id Rename struct

[PATCH v2 6/8] merge-recursive: convert struct merge_file_info to object_id

Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- merge-recursive.c | 39 --- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index a07050cd..bc455491 100644 --- a/merge-recursive.c

[PATCH v2 2/8] Apply object_id Coccinelle transformations.

Apply the set of semantic patches from contrib/examples/coccinelle to convert some leftover places using struct object_id's hash member to instead use the wrapper functions that take struct object_id natively. Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- bi

Re: [PATCH v2 3/8] Convert struct diff_filespec to struct object_id

On Tue, Jun 21, 2016 at 03:22:04PM -0700, Junio C Hamano wrote: > "brian m. carlson" <sand...@crustytoothpaste.net> writes: > > I was trying to make sure there is no misconversion, but some lines > that got wrapped were distracting. For example: > >

Re: Migrating away from SHA-1?

the two first conditions are fulfilled, is there anything I could > do to help this transition? (including helping Brian if his work hasn't > actually ended yet) You're welcome to send patches if you like. I try to avoid areas I know are under heavy development, like the refs code. -- brian m. carlson /

[PATCH v3 11/11] diff: convert prep_temp_blob to struct object_id.

All of the callers of this function use struct object_id, so convert it to use struct object_id in its arguments and internally. Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- diff.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/diff.c b/

[PATCH v3 09/11] merge-recursive: convert leaf functions to use struct object_id

Convert all but two of the static functions in this file to use struct object_id. Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gits...@pobox.com> --- merge-recursive.c | 236 +++--- 1

[PATCH v3 07/11] merge-recursive: convert struct stage_data to use object_id

stage_data *p; expression E1; @@ - p->stages[E1].sha + p->stages[E1].oid.hash Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gits...@pobox.com> --- merge-recursive.c | 38 ++ 1 file changed, 18

[PATCH v3 05/11] diff: convert struct diff_filespec to struct object_id

ilespec *p; @@ - p->sha1 + p->oid.hash Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gits...@pobox.com> --- builtin/blame.c | 6 +-- builtin/fast-export.c | 10 ++--- builtin/reset.c | 4 +- combine-diff.

[PATCH v3 10/11] merge-recursive: convert merge_recursive_generic to object_id

Convert this function and the git merge-recursive subcommand to use struct object_id. Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gits...@pobox.com> --- builtin/merge-recursive.c | 20 ++-- merge-recursive.c

[PATCH v3 00/11] struct object_id, Part 4

. * Add a README to that folder explaining what they are. * Adjust the Coccinelle patches to transform plain structs before pointers to structs to avoid misconversions. This addresses the issue that Johannes Sixt caught originally. brian m. carlson (11): hex: add oid_to_hex_r. contrib

[PATCH v3 03/11] Convert hashcpy with null_sha1 to hashclr.

semantic patch: @@ expression E1; @@ -hashcpy(E1, null_sha1); +hashclr(E1); Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- builtin/merge.c | 2 +- builtin/unpack-objects.c | 4 ++-- diff.c | 2 +- submodule-co

[PATCH v3 01/11] hex: add oid_to_hex_r.

This function works just like sha1_to_hex_r, except that it takes a pointer to struct object_id instead of a pointer to unsigned char. Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- cache.h | 1 + hex.c | 5 + 2 files changed, 6 insertions(+) diff --git a/cac

[PATCH v3 04/11] coccinelle: apply object_id Coccinelle transformations

Apply the set of semantic patches from contrib/coccinelle to convert some leftover places using struct object_id's hash member to instead use the wrapper functions that take struct object_id natively. Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> Signed-off-by: Junio C

[PATCH v3 06/11] diff: rename struct diff_filespec's sha1_valid member

o; @@ - o.sha1_valid + o.oid_valid @@ struct diff_filespec *p; @@ - p->sha1_valid + p->oid_valid Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gits...@pobox.com> --- combine-diff.c| 4 ++-- diff.c| 28 ++

[PATCH v3 02/11] contrib/coccinelle: add basic Coccinelle transforms

to the struct object_id transformation, as well as a README. Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gits...@pobox.com> --- contrib/coccinelle/README | 2 + contrib/coccinelle/object_i

Re: [PATCH v3 06/11] diff: rename struct diff_filespec's sha1_valid member

On Fri, Jun 24, 2016 at 05:29:18PM -0700, Junio C Hamano wrote: > "brian m. carlson" <sand...@crustytoothpaste.net> writes: > > > > @@ > > struct diff_filespec o; > > @@ > > - o.sha1_valid > > + o.oid_valid > > > > @@ > &g

[PATCH v3 08/11] merge-recursive: convert struct merge_file_info to object_id

Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gits...@pobox.com> --- merge-recursive.c | 39 --- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index

Re: Easiest way to clone over an existing directory?

git remote add origin https://git.crustytoothpaste.net/git/bmc/homedir.git git pull origin master I'm not sure if that's the officially sanctioned way to do it, but it does work reliably. -- brian m. carlson / brian with sandals: Houston, Texas, US +1 832 623 2791 | https://www.crustytoothpas

Re: [PATCH] remote-curl: don't fall back to Basic auth if we haven't tried Negotiate

c auth as a fallback. I don't normally use that on my servers, so I'd have to enable it and try it out. -- brian m. carlson / brian with sandals: Houston, Texas, US +1 832 623 2791 | https://www.crustytoothpaste.net/~bmc | My opinion only OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994

Re: [PATCH] remote-curl: don't fall back to Basic auth if we haven't tried Negotiate

will not have to > interact with the prompt at all, right? Yes, that's true. I'll try to come up with a patch this weekend that implements that (maybe remote.forceAuth = true or somesuch). -- brian m. carlson / brian with sandals: Houston, Texas, US +1 832 623 2791 | https://www.crustytoothpa

Re: [PATCH] remote-curl: don't fall back to Basic auth if we haven't tried Negotiate

ibcurl just needs something to tell it to do authentication. -- brian m. carlson / brian with sandals: Houston, Texas, US +1 832 623 2791 | https://www.crustytoothpaste.net/~bmc | My opinion only OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187 signature.asc Description: PGP signature

Re: [PATCH] remote-curl: don't fall back to Basic auth if we haven't tried Negotiate

P client code to stop trying authentication mechanisms that > don't use a password (currently Negotiate) after the first > failure, since if they failed the first time, they will never > succeed. I think what's happening here is no username is ever provided, so libcurl neve

Re: [PATCH] travis-ci: run previously failed tests first, then slowest to fastest

out. [0] Debian amd64/sid, ThinkPad X220. -- brian m. carlson / brian with sandals: Houston, Texas, US +1 832 623 2791 | https://www.crustytoothpaste.net/~bmc | My opinion only OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187 signature.asc Description: PGP signature

Re: [PATCH] Documentation: remove unnecessary backslashes

ammar at some point, which should hopefully make things a bit less insane. -- brian m. carlson / brian with sandals: Houston, Texas, US +1 832 623 2791 | https://www.crustytoothpaste.net/~bmc | My opinion only OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187 signature.asc Description: PGP signature

[PATCH] http: add option to try authentication without username

Performing GSS-Negotiate authentication using Kerberos does not require specifying a username or password, since that information is already included in the ticket itself. However, libcurl refuses to perform authentication if it has not been provided with a username and password. Add an option,

Re: [PATCH] http: add option to try authentication without username

On Mon, Feb 15, 2016 at 03:19:25PM -0500, Eric Sunshine wrote: > On Mon, Feb 15, 2016 at 1:44 PM, brian m. carlson > <sand...@crustytoothpaste.net> wrote: > > Performing GSS-Negotiate authentication using Kerberos does not require > > specifying a username or password

Re: [PATCH] http: add option to try authentication without username

On Mon, Feb 15, 2016 at 03:34:51PM -0500, Jeff King wrote: > On Mon, Feb 15, 2016 at 08:29:37PM +0000, brian m. carlson wrote: > > That would work. I was concerned about the credential_fill call > > actually prompting the user, but it appears that it doesn't do that if > >

Re: [PATCH] http: add option to try authentication without username

On Mon, Feb 15, 2016 at 01:39:30PM -0800, Junio C Hamano wrote: > "brian m. carlson" <sand...@crustytoothpaste.net> writes: > > > On Mon, Feb 15, 2016 at 03:34:51PM -0500, Jeff King wrote: > > ... > >> So I think this hack should remain pur

Re: [PATCH] http: add option to try authentication without username

On Mon, Feb 15, 2016 at 04:46:43PM -0500, Eric Sunshine wrote: > On Mon, Feb 15, 2016 at 4:39 PM, Junio C Hamano <gits...@pobox.com> wrote: > > "brian m. carlson" <sand...@crustytoothpaste.net> writes: > >> On Mon, Feb 15, 2016 at 03:34:51PM -0500, Jef

Re: [PATCH] remote-curl: don't fall back to Basic auth if we haven't tried Negotiate

very helpful because now we have to have our own version of patched > Git :( I sent in a patch (and I believe I CC'd you) that adds an option http.emptyAuth that can be used in this case. It should make its way to a future release. -- brian m. carlson / brian with sandals: Houston

Re: Making git apply always work relative to current directory

On Sat, Mar 05, 2016 at 11:31:53AM -0800, Junio C Hamano wrote: > "brian m. carlson" <sand...@crustytoothpaste.net> writes: > > > If I run git apply --no-index --verbose , it succeeds in both > > cases, but when I'm in the git repository, it *silently does noth

Making git apply always work relative to current directory

a difference. I'm using Git 2.7.2. Is there a way to tell git apply that it should apply relative to the current working directory, no matter what? I'm happy to send a patch to either the documentation or git apply if necessary. -- brian m. carlson / brian with sandals: Houston, Texas, US +1

[PATCH v2 0/6] object_id Part 3

cleanly and is not likely to conflict with other topics in flight. My intention is to send smaller series more frequently, with the goal of avoiding or minimizing conflicts where possible. Changes from v1: * Remove dereference of object_id pointer in boolean context. brian m. carlson (6): Introduce

[PATCH v2 4/6] Convert struct name_entry to use struct object_id.

Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- builtin/grep.c | 6 +++--- builtin/merge-tree.c | 18 +- builtin/pack-objects.c | 4 ++-- builtin/reflog.c | 4 ++-- cache-tree.c | 4 ++-- fsck.c | 4 ++--

[PATCH v2 5/6] tree-walk: convert tree_entry_extract to struct object_id

Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- fsck.c| 6 +++--- match-trees.c | 12 ++-- tree-diff.c | 2 +- tree-walk.c | 10 +- tree-walk.h | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/fsck.c b/fsck.c

[PATCH v2 2/6] test-match-trees: convert to use struct object_id

Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- test-match-trees.c | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test-match-trees.c b/test-match-trees.c index 4dad7095..41aff841 100644 --- a/test-match-trees.c +++ b/test-match-t

[PATCH v2 1/6] Introduce a get_oid function.

The get_oid function is equivalent to the get_sha1 function, but uses a struct object_id instead. Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- cache.h | 2 ++ sha1_name.c | 9 + 2 files changed, 11 insertions(+) diff --git a/cache.h b/cache.h index 27

[PATCH v2 3/6] match-trees: convert shift_tree and shift_tree_by to object_id

Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- cache.h| 4 ++-- match-trees.c | 44 ++-- merge-recursive.c | 4 ++-- test-match-trees.c | 2 +- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/c

[PATCH v2 6/6] match-trees: convert several leaf functions to struct object_id

Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- match-trees.c | 30 +++--- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/match-trees.c b/match-trees.c index 8ca7c68f..396b7338 100644 --- a/match-trees.c +++ b/match-trees.c @@

Re: Migrating away from SHA-1?

nts, GIT_SHA1_RAWSZ and GIT_SHA1_HEXSZ, that abstract the 20 and 40 values in the codebase so they can be changed in the future. While this is a project I've been mostly working on, I have no objection to other people sending in a patch or series as they feel like it. -- brian m. carlson / brian wit

[PATCH 2/6] test-match-trees: convert to use struct object_id

Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- test-match-trees.c | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test-match-trees.c b/test-match-trees.c index 4dad7095..41aff841 100644 --- a/test-match-trees.c +++ b/test-match-t

[PATCH 0/6] object_id Part 3

pass an empty entry to a function which might dereference it. This series rebases onto next cleanly and is not likely to conflict with other topics in flight. My intention is to send smaller series more frequently, with the goal of avoiding or minimizing conflicts where possible. brian m. carlson

[PATCH 4/6] Convert struct name_entry to use struct object_id.

Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- builtin/grep.c | 6 +++--- builtin/merge-tree.c | 18 +- builtin/pack-objects.c | 4 ++-- builtin/reflog.c | 4 ++-- cache-tree.c | 4 ++-- fsck.c | 4 ++--

[PATCH 3/6] match-trees: convert shift_tree and shift_tree_by to object_id

Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- cache.h| 4 ++-- match-trees.c | 44 ++-- merge-recursive.c | 4 ++-- test-match-trees.c | 2 +- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/c

Re: Default authentication over https?

e why it didn't in the original case. But this means the whole thing > is happening over a single TCP session, which is good (and I didn't have > to change my config at all). This looks fine from my point of view. GSS-Negotiate and Digest are going to require at least one round-trip because they n

[PATCH 1/6] Introduce a get_oid function.

The get_oid function is equivalent to the get_sha1 function, but uses a struct object_id instead. Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- cache.h | 2 ++ sha1_name.c | 9 + 2 files changed, 11 insertions(+) diff --git a/cache.h b/cache.h index 27

[PATCH 6/6] match-trees: convert several leaf functions to struct object_id

Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- match-trees.c | 30 +++--- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/match-trees.c b/match-trees.c index 8ca7c68f..396b7338 100644 --- a/match-trees.c +++ b/match-trees.c @@

[PATCH 5/6] tree-walk: convert tree_entry_extract to struct object_id

Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net> --- fsck.c| 6 +++--- match-trees.c | 12 ++-- tree-diff.c | 2 +- tree-walk.c | 10 +- tree-walk.h | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/fsck.c b/fsck.c

Re: [PATCH 4/6] Convert struct name_entry to use struct object_id.

On Tue, Apr 19, 2016 at 04:02:22PM -0700, Junio C Hamano wrote: > "brian m. carlson" <sand...@crustytoothpaste.net> writes: > > > @@ -314,7 +314,7 @@ static int threeway_callback(int n, unsigned long mask, > > unsigned long dirmask, s > > } >

Re: [PATCH 1/2] pager: move pager-specific setup into the build

DITOR set to "gvim -f" on occasion and seeing how tools sometimes handle that poorly. Even without that, I think this series is probably an improvement over the status quo. -- brian m. carlson / brian with sandals: Houston, Texas, US +1 832 623 2791 | https://www.crustytoothpaste.net/~bmc | My opinion only OpenPGP: https://keybase.io/bk2204 signature.asc Description: PGP signature

Re: [PATCH 1/2] pager: move pager-specific setup into the build

On Mon, Aug 01, 2016 at 10:57:02AM +0200, Jakub Narębski wrote: > W dniu 01.08.2016 o 09:00, Eric Wong pisze: > > "brian m. carlson" <sand...@crustytoothpaste.net> wrote: > >> So it looks like this function splits on spaces but doesn't provide any > >

Re: [PATCH] config.mak.uname: set PERL_PATH for FreeBSD 5.0+

write which is "command -v", which may or may not be more portable. It does have the desired output, though. -- brian m. carlson / brian with sandals: Houston, Texas, US +1 832 623 2791 | https://www.crustytoothpaste.net/~bmc | My opinion only OpenPGP: https://keybase.io/bk2204 signature.asc Description: PGP signature

Re: Git and SHA-1 security (again)

; issues of the SHA-1 algorithm. We would need to teach Git to pick that > mapping up if available and use it, of course. I think that might be easier. Considering the number of tests that hard-code object names, I might need that for the testsuite. -- brian m. carlson / brian with sandals:

Re: Git and SHA-1 security (again)

On Sun, Jul 17, 2016 at 05:19:02PM +0200, Duy Nguyen wrote: > On Sun, Jul 17, 2016 at 4:21 PM, brian m. carlson > <sand...@crustytoothpaste.net> wrote: > > On Sun, Jul 17, 2016 at 10:01:38AM +0200, Johannes Schindelin wrote: > >> Out of curiosity: have you considered som

Re: Git and SHA-1 security (again)

On Sun, Jul 17, 2016 at 12:23:49PM -0400, Theodore Ts'o wrote: > On Sun, Jul 17, 2016 at 03:42:34PM +0000, brian m. carlson wrote: > > As I said, I'm not planning on multiple hash support at first, but it > > doesn't appear impossible if we go this route. We might still have

Re: Git and SHA-1 security (again)

On Mon, Jul 18, 2016 at 09:00:06AM +0200, Johannes Schindelin wrote: > Hi Brian, > > On Sun, 17 Jul 2016, brian m. carlson wrote: > > > On Sun, Jul 17, 2016 at 10:01:38AM +0200, Johannes Schindelin wrote: > > > Out of curiosity: have you considered someth

Re: Git and SHA-1 security (again)

, avoids future-proofing problems, and minimizes performance impacts due to naming like you mentioned. [0] We are practically limited to 256-bit hashes because anything longer will wrap on an 80-column terminal when in hex form. -- brian m. carlson / brian with sandals: Houston, Texas, US +1 832 6

Re: Git and SHA-1 security (again)

ecome my object-id-part5. I recommend if you're planning on doing some of this work that you try to avoid areas which are under work by other developers, especially the refs code, which is undergoing massive changes. Other people will appreciate it. -- brian m. carlson / brian with sandals: Houst

Re: Git and SHA-1 security (again)

checking the output of the following commands: git grep 'unsigned char.*20' | wc -l git grep 'struct object_id' | wc -l You are also welcome to contribute, of course. -- brian m. carlson / brian with sandals: Houston, Texas, US +1 832 623 2791 | https://www.crustytoothpaste.net/~bmc | My opinion only OpenPGP: https://keybase.io/bk2204 signature.asc Description: PGP signature

Re: Dependencies required for offline installation

o compile with PCRE because it enables git grep -P, which we use in development. If you want git-svn, you'll of course need subversion. In case you do move back to RHEL 5 (which I don't recommend), be aware that the libcurl version is old enough that some features (DAV is one, if I remember correct

Re: [PATCH] config.mak.uname: define NEEDS_LIBRT under Linux, for now

s, > so I don't think this will introduce new breakage for users of > alternative libc implementations. This is a good idea. If it's broken with Debian wheezy, it will also be broken for RHEL/CentOS 6. People who really want the slimmest linkage can use the -Wl,--as-needed flag. -- bri

<    2   3   4   5   6   7   8   9   10   11   >