projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'dg/subtree-fixes'
[git.git]
/
gpg-interface.c
diff --git
a/gpg-interface.c
b/gpg-interface.c
index 0863c618007a02fa20c27b62614de8a554128d0c..45590330aa3131da69174899783913cee9a44c31 100644
(file)
--- a/
gpg-interface.c
+++ b/
gpg-interface.c
@@
-109,10
+109,10
@@
int verify_signed_buffer(const char *payload, size_t payload_size,
args_gpg[0] = gpg_program;
fd = git_mkstemp(path, PATH_MAX, ".git_vtag_tmpXXXXXX");
if (fd < 0)
args_gpg[0] = gpg_program;
fd = git_mkstemp(path, PATH_MAX, ".git_vtag_tmpXXXXXX");
if (fd < 0)
- return error(
"could not create temporary file '%s': %s"
,
+ return error(
_("could not create temporary file '%s': %s")
,
path, strerror(errno));
if (write_in_full(fd, signature, signature_size) < 0)
path, strerror(errno));
if (write_in_full(fd, signature, signature_size) < 0)
- return error(
"failed writing detached signature to '%s': %s"
,
+ return error(
_("failed writing detached signature to '%s': %s")
,
path, strerror(errno));
close(fd);
path, strerror(errno));
close(fd);
@@
-124,14
+124,16
@@
int verify_signed_buffer(const char *payload, size_t payload_size,
args_gpg[2] = path;
if (start_command(&gpg)) {
unlink(path);
args_gpg[2] = path;
if (start_command(&gpg)) {
unlink(path);
- return error(
"could not run gpg."
);
+ return error(
_("could not run gpg.")
);
}
write_in_full(gpg.in, payload, payload_size);
close(gpg.in);
}
write_in_full(gpg.in, payload, payload_size);
close(gpg.in);
- if (gpg_output)
+ if (gpg_output)
{
strbuf_read(gpg_output, gpg.err, 0);
strbuf_read(gpg_output, gpg.err, 0);
+ close(gpg.err);
+ }
ret = finish_command(&gpg);
unlink_or_warn(path);
ret = finish_command(&gpg);
unlink_or_warn(path);