On Mon, May 9, 2016 at 12:07 PM, Jeff King <peff@xxxxxxxx> wrote:
> On Sat, May 07, 2016 at 06:15:19PM +0200, Torsten Bögershausen wrote:
>> These tests fail here under Mac OS,
>> they pass under Linux:
>> commit ff3d9b660a4b6e9d3eeb664ce1febe717adff737
>> I haven't had a chance to dig further.
>
> I assume you mean t6302. It looks like the difference is not Mac OS, but
> rather that the GPG prerequisite is not fulfilled, so we are missing a
> few of the tags.
>
> Commit 618310a introduced a helper to munge the "expect" output. Using
> that fixes some of the cases, but not test 34. That one is expecting
> blank lines for tags, so test_prepare_expect doesn't know which lines
> are related to GPG.
>
> We could fix it by tweaking the test like this:
> [...snip...]
> However, I wonder if we could improve on the strategy in 618310a, and
> simply create non-signed versions of the "signed" tags when GPG is not
> available. That would make tests looking at the whole ref namespace
> more consistent. And any tests which wanted to look specifically at the
> signed attributes should be protected with the GPG prereq anyway (it
> doesn't look like there are any currently, though).
>
> I.e., something like:
> [...snip...]
> test_expect_success 'setup some history and refs' '
> @@ -24,9 +20,12 @@ test_expect_success 'setup some history and refs' '
> git tag -m "Annonated doubly" doubly-annotated-tag annotated-tag &&
> if test_have_prereq GPG
> then
> - git tag -s -m "A signed tag" signed-tag &&
> - git tag -s -m "Signed doubly" doubly-signed-tag signed-tag
> + sign=-s
> + else
> + sign=
> fi &&
> + git tag $sign -m "A signed tag" signed-tag &&
> + git tag $sign -m "Signed doubly" doubly-signed-tag signed-tag &&
> git checkout master &&
> git update-ref refs/odd/spot master
> '
The latter seems very preferable, though perhaps it could be made more
concise like this?
sign=
test_have_prereq GPG && sign=-s
(But that's a minor issue.)
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html