delta/git.git, branch mg/verify-commit

t7510: do not fail when gpg warns about insecure memory

2015-03-10T22:25:22+00:00

Depending on how gpg was built, it may issue the following
message to stderr when run:

  Warning: using insecure memory!

When the test is collecting gpg output it is therefore not
enough to just match on a "gpg: " prefix it must also match
on a "Warning: " prefix wherever it needs to match lines
that have been produced by gpg.

Signed-off-by: Kyle J. McKay 
Acked-by: Michael J Gruber 
Signed-off-by: Junio C Hamano

t7510: test verify-commit

2014-06-23T22:50:31+00:00

This mixes the "git verify-commit" tests in with the "git show
--show-signature" tests, to keep the tests more readable.

The tests already mix in the "call show" tests with the "verify" tests.
So in case of a test beakage, a '-v' run would be needed to reveal the
exact point of breakage anyway.

Additionally, test the actual output of "git verify-commit" and "git
show --show-signature" and compare to "git cat-file".

Signed-off-by: Michael J Gruber 
Signed-off-by: Junio C Hamano

t7510: exit for loop with test result

2014-06-23T22:50:31+00:00

t7510 uses for loops in a subshell, which need to make sure that the test
returns with the appropriate error code from within the loop.

Restructure the loops as the usual && chains with a single point of
"exit 1" at the end of the loop to make this clearer.

Signed-off-by: Michael J Gruber 
Signed-off-by: Junio C Hamano

verify-commit: scriptable commit signature verification

2014-06-23T22:50:31+00:00

Commit signatures can be verified using "git show -s --show-signature"
or the "%G?" pretty format and parsing the output, which is well suited
for user inspection, but not for scripting.

Provide a command "verify-commit" which is analogous to "verify-tag": It
returns 0 for good signatures and non-zero otherwise, has the gpg output
on stderr and (optionally) the commit object on stdout, sans the
signature, just like "verify-tag" does.

Signed-off-by: Michael J Gruber 
Signed-off-by: Junio C Hamano

gpg-interface: provide access to the payload

2014-06-23T22:50:30+00:00

In contrast to tag signatures, commit signatures are put into the
header, that is between the other header parts and commit messages.

Provide access to the commit content sans the signature, which is the
payload that is actually signed. Commit signature verification does the
parsing anyways, and callers may wish to act on or display the commit
object sans the signature.

Signed-off-by: Michael J Gruber 
Signed-off-by: Junio C Hamano

gpg-interface: provide clear helper for struct signature_check

2014-06-23T22:50:29+00:00

The struct has been growing members whose malloced memory needs to be
freed. Do this with one helper function so that no malloced memory shall
be left unfreed.

Signed-off-by: Michael J Gruber 
Signed-off-by: Junio C Hamano

Second batch for 2.1

2014-06-06T18:42:05+00:00

Signed-off-by: Junio C Hamano

Merge branch 'ss/howto-manage-trunk'

2014-06-06T18:39:12+00:00

* ss/howto-manage-trunk:
  How to keep a project's canonical history correct.

Merge branch 'mc/git-p4-prepare-p4-only'

2014-06-06T18:38:57+00:00

* mc/git-p4-prepare-p4-only:
  git-p4: Do not include diff in spec file when just preparing p4

Merge branch 'jn/test-lint-unmoor'

2014-06-06T18:38:54+00:00

* jn/test-lint-unmoor:
  test-lint: find unportable sed, echo, test, and export usage after &&