summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-07-10 18:27:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-07-10 18:27:34 (GMT)
commit39177c7f184b4c07a1f53f99f59c920c3fb6222d (patch)
tree1a536ab74526d6aaa089b4e72742b4b3686c89fe /builtin/merge.c
parent3d77f72efe79eb90f67aec9ecf6d4bd11fc9a78c (diff)
parent8e92c2cf37038a3b3bb82724f018e4d0ab1180ff (diff)
downloadgit-39177c7f184b4c07a1f53f99f59c920c3fb6222d.zip
git-39177c7f184b4c07a1f53f99f59c920c3fb6222d.tar.gz
git-39177c7f184b4c07a1f53f99f59c920c3fb6222d.tar.bz2
Merge branch 'mg/verify-commit'
Add 'verify-commit' to be used in a way similar to 'verify-tag' is used. Further work on verifying the mergetags might be needed. * mg/verify-commit: t7510: test verify-commit t7510: exit for loop with test result verify-commit: scriptable commit signature verification gpg-interface: provide access to the payload gpg-interface: provide clear helper for struct signature_check
Diffstat (limited to 'builtin/merge.c')
-rw-r--r--builtin/merge.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/builtin/merge.c b/builtin/merge.c
index b49c310..86e9c61 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1282,10 +1282,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
printf(_("Commit %s has a good GPG signature by %s\n"),
hex, signature_check.signer);
- free(signature_check.gpg_output);
- free(signature_check.gpg_status);
- free(signature_check.signer);
- free(signature_check.key);
+ signature_check_clear(&signature_check);
}
}