[PATCH v3 20/28] t4029: fix test indentation

2018-05-15 Thread brian m. carlson
We typically indent our tests with a single tab, partially so that we can take advantage of indented heredocs. Make this change and move the quote marks to be in the typical position for our tests. Signed-off-by: brian m. carlson --- t/t4029-diff-trailing-space.sh | 33

[PATCH v3 18/28] t4020: abstract away SHA-1-specific constants

2018-05-15 Thread brian m. carlson
Adjust the test so that it computes variables for blobs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t4020-diff-external.sh | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/t/t4020-diff-external.sh b/t/t4020-diff-external.sh index

[PATCH v3 19/28] t4022: abstract away SHA-1-specific constants

2018-05-15 Thread brian m. carlson
Adjust the test so that it computes variables for blobs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t4022-diff-rewrite.sh | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/t/t4022-diff-rewrite.sh b/t/t4022-diff-rewrite.sh index cb51d9f9d4

[PATCH v3 13/28] t3702: abstract away SHA-1-specific constants

2018-05-15 Thread brian m. carlson
Strip out the index lines in the diff before comparing them, as these will differ between hash algorithms. This leads to a smaller, simpler change than editing the index line. Signed-off-by: brian m. carlson --- t/t3702-add-edit.sh | 7 +++ 1 file changed, 3 insertions(+), 4 deletions

[PATCH v3 12/28] t3103: abstract away SHA-1-specific constants

2018-05-15 Thread brian m. carlson
Adjust the test so that it uses variables and command substitution for trees instead of hard-coded hashes. This also has the benefit of making it more obvious how the test works. Signed-off-by: brian m. carlson --- t/t3103-ls-tree-misc.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion

[PATCH v3 08/28] t1512: skip test if not using SHA-1

2018-05-15 Thread brian m. carlson
This test relies on objects with colliding short names which are necessarily dependent on the hash used. Skip the test if we're not using SHA-1. Signed-off-by: brian m. carlson --- t/t1512-rev-parse-disambiguation.sh | 6 ++ 1 file changed, 6 insertions(+) diff --git a/t/t1512-rev-

[PATCH v3 06/28] t0000: annotate with SHA1 prerequisite

2018-05-15 Thread brian m. carlson
Since this is a core test that tests basic functionality, annotate the assertions that have dependencies on SHA-1 with the appropriate prerequisite. Signed-off-by: brian m. carlson --- t/t-basic.sh | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git

[PATCH v3 16/28] t4008: abstract away SHA-1-specific constants

2018-05-15 Thread brian m. carlson
Adjust the test so that it computes variables for blobs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t4008-diff-break-rewrite.sh | 59 +++ 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/t/t4008-diff-break-rewrite.sh b

[PATCH v3 25/28] t4042: abstract away SHA-1-specific constants

2018-05-15 Thread brian m. carlson
Adjust the test so that it computes variables for blobs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t4042-diff-textconv-caching.sh | 16 ++-- 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/t/t4042-diff-textconv-caching.sh b/t/t4042-diff

[PATCH v3 22/28] t4030: abstract away SHA-1-specific constants

2018-05-15 Thread brian m. carlson
Adjust the test so that it computes variables for blobs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t4030-diff-textconv.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/t/t4030-diff-textconv.sh b/t/t4030-diff-textconv.sh index aad6c7f78d

[PATCH v3 24/28] t4205: sort log output in a hash-independent way

2018-05-15 Thread brian m. carlson
object ID. Signed-off-by: brian m. carlson --- t/t4205-log-pretty-formats.sh | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh index 591f35daaf..2052cadb11 100755 --- a/t/t4205-log-pretty-formats.sh +++ b/t

[PATCH v3 28/28] t5300: abstract away SHA-1-specific constants

2018-05-15 Thread brian m. carlson
Adjust the test so that it computes variables for object IDs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t5300-pack-object.sh | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh index

[PATCH v3 26/28] t4045: abstract away SHA-1-specific constants

2018-05-15 Thread brian m. carlson
Adjust the test so that it computes variables for blobs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t4045-diff-relative.sh | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/t/t4045-diff-relative.sh b/t/t4045-diff-relative.sh index 6471a68701

[PATCH v3 23/28] t/lib-diff-alternative: abstract away SHA-1-specific constants

2018-05-15 Thread brian m. carlson
Adjust the test code so that it computes variables for blobs instead of using hard-coded hashes. This makes t4033 and t4050 (the patience and histogram tests) pass. Signed-off-by: brian m. carlson --- t/lib-diff-alternative.sh | 12 1 file changed, 8 insertions(+), 4 deletions

[PATCH v3 27/28] t4208: abstract away SHA-1-specific constants

2018-05-15 Thread brian m. carlson
Adjust the test so that it computes variables for object IDs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t4208-log-magic-pathspec.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/t4208-log-magic-pathspec.sh b/t/t4208-log-magic-pathspec.sh

[PATCH v3 17/28] t4014: abstract away SHA-1-specific constants

2018-05-15 Thread brian m. carlson
Adjust the test so that it computes values for blobs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t4014-format-patch.sh | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index dac3f349a3

[PATCH v3 00/28] Hash-independent tests

2018-05-15 Thread brian m. carlson
till preserving alignment. * Restore blank line between tests. tbdiff output below. brian m. carlson (28): t/test-lib: add an SHA1 prerequisite t/test-lib: introduce ZERO_OID t: switch $_z40 to $ZERO_OID t/test-lib: introduce OID_REGEX t: switch $_x40 to $OID_REGEX t: annotate with

[PATCH v3 07/28] t1007: annotate with SHA1 prerequisite

2018-05-15 Thread brian m. carlson
Since this is a core test that tests basic functionality, annotate the assertions that have dependencies on SHA-1 with the appropriate prerequisite. Signed-off-by: brian m. carlson --- t/t1007-hash-object.sh | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/t

[PATCH v3 02/28] t/test-lib: introduce ZERO_OID

2018-05-15 Thread brian m. carlson
bject ID, regardless of the length of the current hash. Signed-off-by: brian m. carlson --- t/test-lib.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/test-lib.sh b/t/test-lib.sh index fce728d2ea..58c2ea52c6 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -184,6 +

[PATCH v3 10/28] t: skip pack tests if not using SHA-1

2018-05-15 Thread brian m. carlson
These tests rely on creating packs with specially named objects which are necessarily dependent on the hash used. Skip these tests if we're not using SHA-1. Signed-off-by: brian m. carlson --- t/t5308-pack-detect-duplicates.sh | 6 ++ t/t5309-pack-delta-cycles.sh | 6 ++ 2

[PATCH v3 04/28] t/test-lib: introduce OID_REGEX

2018-05-15 Thread brian m. carlson
ect a regex matching the appropriate object ID, regardless of the length of the current hash. Signed-off-by: brian m. carlson --- t/test-lib.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/test-lib.sh b/t/test-lib.sh index 58c2ea52c6..fed21c3dfc 100644 --- a/t/test-lib.sh

[PATCH v3 03/28] t: switch $_z40 to $ZERO_OID

2018-05-15 Thread brian m. carlson
Switch all uses of $_z40 to $ZERO_OID so that they work correctly with larger hashes. This commit was created by using the following sed command to modify all files in the t directory except t/test-lib.sh: sed -i 's/\$_z40/$ZERO_OID/g' Signed-off-by: brian m. carlson --- t/t1006-c

[PATCH v3 09/28] t4044: skip test if not using SHA-1

2018-05-15 Thread brian m. carlson
This test relies on objects with colliding short names which are necessarily dependent on the hash used. Skip the test if we're not using SHA-1. Signed-off-by: brian m. carlson --- t/t4044-diff-index-unique-abbrev.sh | 6 ++ 1 file changed, 6 insertions(+) diff --git a/t/t4044-diff-

[PATCH v3 01/28] t/test-lib: add an SHA1 prerequisite

2018-05-15 Thread brian m. carlson
ns of these tests which handle both SHA-1 and NewHash. Signed-off-by: brian m. carlson --- t/test-lib.sh | 7 +++ 1 file changed, 7 insertions(+) diff --git a/t/test-lib.sh b/t/test-lib.sh index ea2bbaaa7a..fce728d2ea 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -1212,3 +12

[PATCH v3 05/28] t: switch $_x40 to $OID_REGEX

2018-05-15 Thread brian m. carlson
Switch all uses of $_x40 to $OID_REGEX so that they work correctly with larger hashes. This commit was created by using the following sed command to modify all files in the t directory except t/test-lib.sh: sed -i 's/\$_x40/$OID_REGEX/g' Signed-off-by: brian m. carlson --- t/d

[PATCH v3 21/28] t4029: abstract away SHA-1-specific constants

2018-05-15 Thread brian m. carlson
Adjust the test so that it computes variables for blobs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t4029-diff-trailing-space.sh | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/t/t4029-diff-trailing-space.sh b/t/t4029-diff-trailing

[PATCH v3 11/28] t2203: abstract away SHA-1-specific constants

2018-05-15 Thread brian m. carlson
Adjust the test so that it computes variables for blobs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t2203-add-intent.sh | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/t/t2203-add-intent.sh b/t/t2203-add-intent.sh index 1797f946b9

[PATCH v3 14/28] t3905: abstract away SHA-1-specific constants

2018-05-15 Thread brian m. carlson
Adjust the test so that it computes variables for blobs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t3905-stash-include-untracked.sh | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/t/t3905-stash-include-untracked.sh b/t/t3905-stash

Re: [PATCH v2 17/28] t4014: abstract away SHA-1-specific constants

2018-05-13 Thread brian m. carlson
On Sun, May 13, 2018 at 09:34:03AM +0200, Johannes Sixt wrote: > Am 13.05.2018 um 04:24 schrieb brian m. carlson: > > diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh > > index dac3f349a3..42b3e11207 100755 > > --- a/t/t4014-format-patch.sh > > ++

[PATCH v2 16/28] t4008: abstract away SHA-1-specific constants

2018-05-12 Thread brian m. carlson
Adjust the test so that it computes variables for blobs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t4008-diff-break-rewrite.sh | 59 +++ 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/t/t4008-diff-break-rewrite.sh b

[PATCH v2 14/28] t3905: abstract away SHA-1-specific constants

2018-05-12 Thread brian m. carlson
Adjust the test so that it computes variables for blobs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t3905-stash-include-untracked.sh | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/t/t3905-stash-include-untracked.sh b/t/t3905-stash

[PATCH v2 25/28] t4042: abstract away SHA-1-specific constants

2018-05-12 Thread brian m. carlson
Adjust the test so that it computes variables for blobs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t4042-diff-textconv-caching.sh | 16 ++-- 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/t/t4042-diff-textconv-caching.sh b/t/t4042-diff

[PATCH v2 24/28] t4205: sort log output in a hash-independent way

2018-05-12 Thread brian m. carlson
object ID. Signed-off-by: brian m. carlson --- t/t4205-log-pretty-formats.sh | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh index 591f35daaf..2052cadb11 100755 --- a/t/t4205-log-pretty-formats.sh +++ b/t

[PATCH v2 23/28] t/lib-diff-alternative: abstract away SHA-1-specific constants

2018-05-12 Thread brian m. carlson
Adjust the test code so that it computes variables for blobs instead of using hard-coded hashes. This makes t4033 and t4050 (the patience and histogram tests) pass. Signed-off-by: brian m. carlson --- t/lib-diff-alternative.sh | 12 1 file changed, 8 insertions(+), 4 deletions

[PATCH v2 27/28] t4208: abstract away SHA-1-specific constants

2018-05-12 Thread brian m. carlson
Adjust the test so that it computes variables for object IDs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t4208-log-magic-pathspec.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/t4208-log-magic-pathspec.sh b/t/t4208-log-magic-pathspec.sh

[PATCH v2 18/28] t4020: abstract away SHA-1-specific constants

2018-05-12 Thread brian m. carlson
Adjust the test so that it computes variables for blobs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t4020-diff-external.sh | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/t/t4020-diff-external.sh b/t/t4020-diff-external.sh index

[PATCH v2 17/28] t4014: abstract away SHA-1-specific constants

2018-05-12 Thread brian m. carlson
Adjust the test so that it computes values for blobs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t4014-format-patch.sh | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index dac3f349a3

[PATCH v2 13/28] t3702: abstract away SHA-1-specific constants

2018-05-12 Thread brian m. carlson
Strip out the index lines in the diff before comparing them, as these will differ between hash algorithms. This leads to a smaller, simpler change than editing the index line. Signed-off-by: brian m. carlson --- t/t3702-add-edit.sh | 7 +++ 1 file changed, 3 insertions(+), 4 deletions

[PATCH v2 26/28] t4045: abstract away SHA-1-specific constants

2018-05-12 Thread brian m. carlson
Adjust the test so that it computes variables for blobs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t4045-diff-relative.sh | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/t/t4045-diff-relative.sh b/t/t4045-diff-relative.sh index 6471a68701

[PATCH v2 11/28] t2203: abstract away SHA-1-specific constants

2018-05-12 Thread brian m. carlson
Adjust the test so that it computes variables for blobs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t2203-add-intent.sh | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/t/t2203-add-intent.sh b/t/t2203-add-intent.sh index 1797f946b9

[PATCH v2 20/28] t4029: fix test indentation

2018-05-12 Thread brian m. carlson
We typically indent our tests with a single tab, partially so that we can take advantage of indented heredocs. Make this change and move the quote marks to be in the typical position for our tests. Signed-off-by: brian m. carlson --- t/t4029-diff-trailing-space.sh | 33

[PATCH v2 21/28] t4029: abstract away SHA-1-specific constants

2018-05-12 Thread brian m. carlson
Adjust the test so that it computes variables for blobs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t4029-diff-trailing-space.sh | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/t/t4029-diff-trailing-space.sh b/t/t4029-diff-trailing-space.sh

[PATCH v2 10/28] t: skip pack tests if not using SHA-1

2018-05-12 Thread brian m. carlson
These tests rely on creating packs with specially named objects which are necessarily dependent on the hash used. Skip these tests if we're not using SHA-1. Signed-off-by: brian m. carlson --- t/t5308-pack-detect-duplicates.sh | 6 ++ t/t5309-pack-delta-cycles.sh | 6 ++ 2

[PATCH v2 06/28] t0000: annotate with SHA1 prerequisite

2018-05-12 Thread brian m. carlson
Since this is a core test that tests basic functionality, annotate the assertions that have dependencies on SHA-1 with the appropriate prerequisite. Signed-off-by: brian m. carlson --- t/t-basic.sh | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git

[PATCH v2 09/28] t4044: skip test if not using SHA-1

2018-05-12 Thread brian m. carlson
This test relies on objects with colliding short names which are necessarily dependent on the hash used. Skip the test if we're not using SHA-1. Signed-off-by: brian m. carlson --- t/t4044-diff-index-unique-abbrev.sh | 6 ++ 1 file changed, 6 insertions(+) diff --git a/t/t4044-diff-

[PATCH v2 08/28] t1512: skip test if not using SHA-1

2018-05-12 Thread brian m. carlson
This test relies on objects with colliding short names which are necessarily dependent on the hash used. Skip the test if we're not using SHA-1. Signed-off-by: brian m. carlson --- t/t1512-rev-parse-disambiguation.sh | 6 ++ 1 file changed, 6 insertions(+) diff --git a/t/t1512-rev-

[PATCH v2 19/28] t4022: abstract away SHA-1-specific constants

2018-05-12 Thread brian m. carlson
Adjust the test so that it computes variables for blobs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t4022-diff-rewrite.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/t/t4022-diff-rewrite.sh b/t/t4022-diff-rewrite.sh index cb51d9f9d4

[PATCH v2 07/28] t1007: annotate with SHA1 prerequisite

2018-05-12 Thread brian m. carlson
Since this is a core test that tests basic functionality, annotate the assertions that have dependencies on SHA-1 with the appropriate prerequisite. Signed-off-by: brian m. carlson --- t/t1007-hash-object.sh | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/t

[PATCH v2 22/28] t4030: abstract away SHA-1-specific constants

2018-05-12 Thread brian m. carlson
Adjust the test so that it computes variables for blobs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t4030-diff-textconv.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/t/t4030-diff-textconv.sh b/t/t4030-diff-textconv.sh index aad6c7f78d

[PATCH v2 12/28] t3103: abstract away SHA-1-specific constants

2018-05-12 Thread brian m. carlson
Adjust the test so that it uses variables and command substitution for trees instead of hard-coded hashes. This also has the benefit of making it more obvious how the test works. Signed-off-by: brian m. carlson --- t/t3103-ls-tree-misc.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion

[PATCH v2 28/28] t5300: abstract away SHA-1-specific constants

2018-05-12 Thread brian m. carlson
Adjust the test so that it computes variables for object IDs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t5300-pack-object.sh | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh index

[PATCH v2 15/28] t4007: abstract away SHA-1-specific constants

2018-05-12 Thread brian m. carlson
Adjust the test so that it computes variables for blobs and uses the ZERO_OID variable instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t4007-rename-3.sh | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/t/t4007-rename-3.sh b/t/t4007

[PATCH v2 04/28] t/test-lib: introduce OID_REGEX

2018-05-12 Thread brian m. carlson
ect a regex matching the appropriate object ID, regardless of the length of the current hash. Signed-off-by: brian m. carlson --- t/test-lib.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/test-lib.sh b/t/test-lib.sh index 58c2ea52c6..fed21c3dfc 100644 --- a/t/test-lib.sh

[PATCH v2 03/28] t: switch $_z40 to $ZERO_OID

2018-05-12 Thread brian m. carlson
Switch all uses of $_z40 to $ZERO_OID so that they work correctly with larger hashes. This commit was created by using the following sed command to modify all files in the t directory except t/test-lib.sh: sed -i 's/\$_z40/$ZERO_OID/g' Signed-off-by: brian m. carlson --- t/t1006-c

[PATCH v2 05/28] t: switch $_x40 to $OID_REGEX

2018-05-12 Thread brian m. carlson
Switch all uses of $_x40 to $OID_REGEX so that they work correctly with larger hashes. This commit was created by using the following sed command to modify all files in the t directory except t/test-lib.sh: sed -i 's/\$_x40/$OID_REGEX/g' Signed-off-by: brian m. carlson --- t/d

[PATCH v2 02/28] t/test-lib: introduce ZERO_OID

2018-05-12 Thread brian m. carlson
bject ID, regardless of the length of the current hash. Signed-off-by: brian m. carlson --- t/test-lib.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/test-lib.sh b/t/test-lib.sh index fce728d2ea..58c2ea52c6 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -184,6 +

[PATCH v2 00/28] Hash-independent tests (part 2)

2018-05-12 Thread brian m. carlson
ent. * Restore blank line between tests. tbdiff output below. brian m. carlson (28): t/test-lib: add an SHA1 prerequisite t/test-lib: introduce ZERO_OID t: switch $_z40 to $ZERO_OID t/test-lib: introduce OID_REGEX t: switch $_x40 to $OID_REGEX t: annotate with SHA1 prerequisite

[PATCH v2 01/28] t/test-lib: add an SHA1 prerequisite

2018-05-12 Thread brian m. carlson
ns of these tests which handle both SHA-1 and NewHash. Signed-off-by: brian m. carlson --- t/test-lib.sh | 7 +++ 1 file changed, 7 insertions(+) diff --git a/t/test-lib.sh b/t/test-lib.sh index ea2bbaaa7a..fce728d2ea 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -1212,3 +12

Re: [PATCH v2] mailmap: update brian m. carlson's email address

2018-05-10 Thread brian m. carlson
On Wed, May 09, 2018 at 12:33:59PM +0530, Kaartic Sivaraam wrote: > On Wednesday 09 May 2018 05:49 AM, brian m. carlson wrote: > > Correct, it doesn't. In my case, I was using --pretty='%aN <%aE>', > > which is how I noticed it in the first place. > > So

Re: [PATCH 2/2] Documentation: render revisions correctly under Asciidoctor

2018-05-08 Thread brian m. carlson
On Tue, May 08, 2018 at 08:31:10PM +0200, Martin Ågren wrote: > On 8 May 2018 at 03:13, brian m. carlson wrote: > > Since this patch fixes the present issue, I'd like to leave it as it is > > and run through a cleanup series a bit later that catches all the > > literal

Re: [PATCH v2] mailmap: update brian m. carlson's email address

2018-05-08 Thread brian m. carlson
`git log` output doesn't consider > the mailmap file by default. Correct, it doesn't. In my case, I was using --pretty='%aN <%aE>', which is how I noticed it in the first place. -- brian m. carlson: Houston, Texas, US OpenPGP: https://keybase.io/bk2204 signature.asc Description: PGP signature

Re: [PATCH 06/28] t0000: annotate with SHA1 prerequisite

2018-05-08 Thread brian m. carlson
On Tue, May 08, 2018 at 08:28:47PM +0200, Martin Ågren wrote: > On 8 May 2018 at 01:40, brian m. carlson wrote: > > As I mentioned in an earlier email, I plan to set an environment > > variable for the algorithms in use and then do something like: > > > > test "$

Re: [PATCH 01/28] t/test-lib: add an SHA1 prerequisite

2018-05-08 Thread brian m. carlson
On Tue, May 08, 2018 at 08:26:05PM +0200, Martin Ågren wrote: > On 8 May 2018 at 01:30, brian m. carlson wrote: > > On Mon, May 07, 2018 at 12:10:39PM +0200, Martin Ågren wrote: > >> Do we actually need more SHA-1-related prereqs, at least long-term, in > >> which c

Re: [PATCH 8/8] gpg-interface: handle alternative signature types

2018-05-08 Thread brian m. carlson
TBOMK. It would be nice if we could still continue to use gpg without having to add specific configuration for it, at least for compatibility reasons. -- brian m. carlson: Houston, Texas, US OpenPGP: https://keybase.io/bk2204 signature.asc Description: PGP signature

Re: main url for linking to git source?

2018-05-08 Thread brian m. carlson
On Mon, May 07, 2018 at 10:46:58PM -0400, Konstantin Ryabitsev wrote: > On Tue, May 08, 2018 at 01:51:30AM +0000, brian m. carlson wrote: > > I think I would also prefer a list of available repositories over a > > hard-coded choice. It may be that some places (say, Australia)

[PATCH v2] mailmap: update brian m. carlson's email address

2018-05-07 Thread brian m. carlson
te address, while the former is current, so switch the order of the addresses so that git log displays the correct address. Signed-off-by: brian m. carlson --- I intentionally avoided the use of the first person here, because I wasn't sure what the preference of the list was on that. Hop

Re: main url for linking to git source?

2018-05-07 Thread brian m. carlson
have lots of options meeting that criterion. -- brian m. carlson: Houston, Texas, US OpenPGP: https://keybase.io/bk2204 signature.asc Description: PGP signature

Re: [PATCH 2/2] Documentation: render revisions correctly under Asciidoctor

2018-05-07 Thread brian m. carlson
On Mon, May 07, 2018 at 06:11:43AM +0200, Martin Ågren wrote: > On 6 May 2018 at 22:42, brian m. carlson wrote: > > When creating a literal block from an indented block without any sort of > > delimiters, Asciidoctor strips off all leading whitespace, resulting in > > a misre

Re: [PATCH] mailmap: update brian m. carlson's email address

2018-05-07 Thread brian m. carlson
ing the output of git log, realized that it was the wrong way around. -- brian m. carlson: Houston, Texas, US OpenPGP: https://keybase.io/bk2204 signature.asc Description: PGP signature

Re: [PATCH] mailmap: update brian m. carlson's email address

2018-05-07 Thread brian m. carlson
ening here is > that cdb6b5ac (".mailmap: Combine more (name, email) to individual > persons", 2013-08-12) removed > > -Brian M. Carlson > > and then added these two lines > > +brian m. carlson Brian M. Carlson > > +brian m. carlson > > > where *

Re: [PATCH 06/28] t0000: annotate with SHA1 prerequisite

2018-05-07 Thread brian m. carlson
o still test the rest of the code if possible so that we know what does and doesn't work. This is a first step in making it obvious what doesn't work, and when we know what the data is supposed to be, we can adjust it by fixing the tests so that it works in all cases. -- brian m. carlson: Houston, Texas, US OpenPGP: https://keybase.io/bk2204 signature.asc Description: PGP signature

Re: [PATCH 01/28] t/test-lib: add an SHA1 prerequisite

2018-05-07 Thread brian m. carlson
On Mon, May 07, 2018 at 12:10:39PM +0200, Martin Ågren wrote: > On 7 May 2018 at 01:17, brian m. carlson wrote: > > Add an SHA1 prerequisite to annotate both of these types of tests and > > disable them when we're using a different hash. In the future, we can > > crea

Re: [PATCH 8/8] gpg-interface: handle alternative signature types

2018-05-07 Thread brian m. carlson
PEM, which specifies MD2 and MD5, algorithms that nobody should be using these days. [1] I would welcome, though, if one could configure only one type of signature verification by, say, setting the signing program to /bin/false in the config. -- brian m. carlson: Houston, Texas, US OpenPGP: https://keybase.io/bk2204 signature.asc Description: PGP signature

Re: [PATCH 00/28] Hash-independent tests (part 2)

2018-05-06 Thread brian m. carlson
On Sun, May 06, 2018 at 09:49:45PM -0400, Eric Sunshine wrote: > On Sun, May 6, 2018 at 7:17 PM, brian m. carlson > wrote: > > This series introduces an SHA1 prerequisite which checks if the hash in > > use is SHA-1, and can be used to skip the test if it is not. > > Addit

Re: [PATCH 16/28] t4008: abstract away SHA-1-specific constants

2018-05-06 Thread brian m. carlson
On Sun, May 06, 2018 at 08:07:46PM -0400, Eric Sunshine wrote: > On Sun, May 6, 2018 at 7:17 PM, brian m. carlson > wrote: > > Adjust the test so that it computes variables for blobs instead of using > > hard-coded hashes. > > > > Signed-off-by: brian m. carlson &g

Re: [PATCH 14/28] t3905: abstract away SHA-1-specific constants

2018-05-06 Thread brian m. carlson
On Sun, May 06, 2018 at 08:03:27PM -0400, Eric Sunshine wrote: > On Sun, May 6, 2018 at 7:17 PM, brian m. carlson > wrote: > > Adjust the test so that it computes variables for blobs instead of using > > hard-coded hashes. > > > > Signed-off-by: brian m. carlson &g

Re: [PATCH 04/28] t/test-lib: introduce FULL_HEX

2018-05-06 Thread brian m. carlson
On Sun, May 06, 2018 at 07:53:42PM -0400, Eric Sunshine wrote: > On Sun, May 6, 2018 at 7:17 PM, brian m. carlson > wrote: > > Currently we have a variable, $_x40, which contains a regex that matches > > a full 40-character hex constant. However, with NewHash, we'll have

[PATCH] mailmap: update brian m. carlson's email address

2018-05-06 Thread brian m. carlson
m. carlson --- .mailmap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.mailmap b/.mailmap index 7c71e88ea5..df7cf6313c 100644 --- a/.mailmap +++ b/.mailmap @@ -25,8 +25,8 @@ Ben Walton Benoit Sigoure Bernt Hansen Brandon Casey -brian m. carlson Brian M

[PATCH 19/28] t4022: abstract away SHA-1-specific constants

2018-05-06 Thread brian m. carlson
Adjust the test so that it computes variables for blobs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t4022-diff-rewrite.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/t/t4022-diff-rewrite.sh b/t/t4022-diff-rewrite.sh index cb51d9f9d4

[PATCH 24/28] t4205: sort log output in a hash-independent way

2018-05-06 Thread brian m. carlson
object ID. Signed-off-by: brian m. carlson --- t/t4205-log-pretty-formats.sh | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh index 591f35daaf..2052cadb11 100755 --- a/t/t4205-log-pretty-formats.sh +++ b/t

[PATCH 27/28] t4208: abstract away SHA-1-specific constants

2018-05-06 Thread brian m. carlson
Adjust the test so that it computes variables for object IDs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t4208-log-magic-pathspec.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/t4208-log-magic-pathspec.sh b/t/t4208-log-magic-pathspec.sh

[PATCH 25/28] t4042: abstract away SHA-1-specific constants

2018-05-06 Thread brian m. carlson
Adjust the test so that it computes variables for blobs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t4042-diff-textconv-caching.sh | 16 ++-- 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/t/t4042-diff-textconv-caching.sh b/t/t4042-diff

[PATCH 22/28] t4030: abstract away SHA-1-specific constants

2018-05-06 Thread brian m. carlson
Adjust the test so that it computes variables for blobs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t4030-diff-textconv.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/t/t4030-diff-textconv.sh b/t/t4030-diff-textconv.sh index aad6c7f78d

[PATCH 13/28] t3702: abstract away SHA-1-specific constants

2018-05-06 Thread brian m. carlson
Strip out the index lines in the diff before comparing them, as these will differ between hash algorithms. This leads to a smaller, simpler change than editing the index line. Signed-off-by: brian m. carlson --- t/t3702-add-edit.sh | 7 +++ 1 file changed, 3 insertions(+), 4 deletions

[PATCH 15/28] t4007: abstract away SHA-1-specific constants

2018-05-06 Thread brian m. carlson
Adjust the test so that it computes variables for blobs and uses the ZERO_OID variable instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t4007-rename-3.sh | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/t/t4007-rename-3.sh b/t/t4007

[PATCH 08/28] t1512: skip test if not using SHA-1

2018-05-06 Thread brian m. carlson
This test relies on objects with colliding short names which are necessarily dependent on the hash used. Skip the test if we're not using SHA-1. Signed-off-by: brian m. carlson --- t/t1512-rev-parse-disambiguation.sh | 6 ++ 1 file changed, 6 insertions(+) diff --git a/t/t1512-rev-

[PATCH 28/28] t5300: abstract away SHA-1-specific constants

2018-05-06 Thread brian m. carlson
Adjust the test so that it computes variables for object IDs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t5300-pack-object.sh | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh index

[PATCH 23/28] t/lib-diff-alternative: abstract away SHA-1-specific constants

2018-05-06 Thread brian m. carlson
Adjust the test code so that it computes variables for blobs instead of using hard-coded hashes. This makes t4033 and t4050 (the patience and histogram tests) pass. Signed-off-by: brian m. carlson --- t/lib-diff-alternative.sh | 12 1 file changed, 8 insertions(+), 4 deletions

[PATCH 20/28] t4029: fix test indentation

2018-05-06 Thread brian m. carlson
We typically indent our tests with a single tab, partially so that we can take advantage of indented heredocs. Make this change and move the quote marks to be in the typical position for our tests. Signed-off-by: brian m. carlson --- t/t4029-diff-trailing-space.sh | 33

[PATCH 21/28] t4029: abstract away SHA-1-specific constants

2018-05-06 Thread brian m. carlson
Adjust the test so that it computes variables for blobs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t4029-diff-trailing-space.sh | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/t/t4029-diff-trailing-space.sh b/t/t4029-diff-trailing-space.sh

[PATCH 26/28] t4045: abstract away SHA-1-specific constants

2018-05-06 Thread brian m. carlson
Adjust the test so that it computes variables for blobs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t4045-diff-relative.sh | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/t/t4045-diff-relative.sh b/t/t4045-diff-relative.sh index 6471a68701

[PATCH 17/28] t4014: abstract away SHA-1-specific constants

2018-05-06 Thread brian m. carlson
Adjust the test so that it computes values for blobs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t4014-format-patch.sh | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 163d64fc32

[PATCH 18/28] t4020: abstract away SHA-1-specific constants

2018-05-06 Thread brian m. carlson
Adjust the test so that it computes variables for blobs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t4020-diff-external.sh | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/t/t4020-diff-external.sh b/t/t4020-diff-external.sh index

[PATCH 16/28] t4008: abstract away SHA-1-specific constants

2018-05-06 Thread brian m. carlson
Adjust the test so that it computes variables for blobs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t4008-diff-break-rewrite.sh | 59 +++ 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/t/t4008-diff-break-rewrite.sh b

[PATCH 11/28] t2203: abstract away SHA-1-specific constants

2018-05-06 Thread brian m. carlson
Adjust the test so that it computes variables for blobs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t2203-add-intent.sh | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/t/t2203-add-intent.sh b/t/t2203-add-intent.sh index 1797f946b9

[PATCH 14/28] t3905: abstract away SHA-1-specific constants

2018-05-06 Thread brian m. carlson
Adjust the test so that it computes variables for blobs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t3905-stash-include-untracked.sh | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/t/t3905-stash-include-untracked.sh b/t/t3905-stash

[PATCH 10/28] t: skip pack tests if not using SHA-1

2018-05-06 Thread brian m. carlson
These tests rely on creating packs with specially named objects which are necessarily dependent on the hash used. Skip these tests if we're not using SHA-1. Signed-off-by: brian m. carlson --- t/t5308-pack-detect-duplicates.sh | 6 ++ t/t5309-pack-delta-cycles.sh | 6 ++ 2

[PATCH 07/28] t1007: annotate with SHA1 prerequisite

2018-05-06 Thread brian m. carlson
Since this is a core test that tests basic functionality, annotate the assertions that have dependencies on SHA-1 with the appropriate prerequisite. Signed-off-by: brian m. carlson --- t/t1007-hash-object.sh | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/t

[PATCH 04/28] t/test-lib: introduce FULL_HEX

2018-05-06 Thread brian m. carlson
ect a regex matching the appropriate object ID, regardless of the length of the current hash. Signed-off-by: brian m. carlson --- t/test-lib.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/test-lib.sh b/t/test-lib.sh index 58c2ea52c6..6d09bd99df 100644 --- a/t/test-lib.sh

[PATCH 09/28] t4044: skip test if not using SHA-1

2018-05-06 Thread brian m. carlson
This test relies on objects with colliding short names which are necessarily dependent on the hash used. Skip the test if we're not using SHA-1. Signed-off-by: brian m. carlson --- t/t4044-diff-index-unique-abbrev.sh | 6 ++ 1 file changed, 6 insertions(+) diff --git a/t/t4044-diff-

<    5   6   7   8   9   10   11   12   13   14   >