Re: [PATCH v2] log: Read gpg settings for signed commit verification
Jeff King writes: > On Wed, Mar 27, 2013 at 09:15:58AM -0700, Junio C Hamano wrote: > >> >} >> > - >> > + if (git_gpg_config(var, value, cb) < 0) >> > + return -1; >> >if (grep_config(var, value, cb) < 0) >> >return -1; >> >> Hmph. I do not particularly like the way the call to grep_config() >> loses information by not ignoring its return value and always >> returning -1, but I'll let it pass for this patch. > > That's my fault for suggesting he follow the same style as grep here. > But I wonder if it is worth the effort. We have never cared about > anything beyond "was there an error" in our config callbacks, and the > value returned from the callbacks is lost in git_parse_file (i.e., we do > not propagate the actual return value, but only check that > "callback(var, value, data) < 0", and die if so). > > Existing callbacks pass data out by writing into a struct pointed to by > the data pointer, which is more flexible, anyway. > > So unless you want to overhaul the whole config system to propagate > return codes back to the caller, I do not think there is any point in > worrying about it. Yeah, that is where my conclusion in the message you are responding comes from ;-) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2] log: Read gpg settings for signed commit verification
On Wed, Mar 27, 2013 at 09:15:58AM -0700, Junio C Hamano wrote: > > } > > - > > + if (git_gpg_config(var, value, cb) < 0) > > + return -1; > > if (grep_config(var, value, cb) < 0) > > return -1; > > Hmph. I do not particularly like the way the call to grep_config() > loses information by not ignoring its return value and always > returning -1, but I'll let it pass for this patch. That's my fault for suggesting he follow the same style as grep here. But I wonder if it is worth the effort. We have never cared about anything beyond "was there an error" in our config callbacks, and the value returned from the callbacks is lost in git_parse_file (i.e., we do not propagate the actual return value, but only check that "callback(var, value, data) < 0", and die if so). Existing callbacks pass data out by writing into a struct pointed to by the data pointer, which is more flexible, anyway. So unless you want to overhaul the whole config system to propagate return codes back to the caller, I do not think there is any point in worrying about it. -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2] log: Read gpg settings for signed commit verification
Hans Brigman writes:
> Content-Type: multipart/mixed;
> boundary="_002_8C726954D36902459248B0627BF2E66F45D70C3E4EAUSP01VMBX10c_"
No multipart/anything please. We prefer to see text/plain.
In general, please follow Documentation/SubmittingPatches.
> From: Jacob Sarvis
Missing SP between name and e-mail.
>
> log: Read gpg settings for signed commit verification
That's the same as the e-mail subject; drop it.
>
> Commit signature verification fails when alternative gpg.program
> signs the commit, but gpg attempts to verify the signature.
> "show --show-signature" and "log --show-signature" do not read
> the gpg.program setting from git config.
> Commit signing, tag signing, and tag verification use this setting
> properly.
>
> Make log and show commands pass through settings to gpg interface.
>
> Signed-off-by: Hans Brigman
Needs the author's Sign-off before yours.
> ---
> builtin/log.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/builtin/log.c b/builtin/log.c
> index 8f0b2e8..31f5a9e 100644
> --- a/builtin/log.c
> +++ b/builtin/log.c
> @@ -23,6 +23,7 @@
> #include "streaming.h"
> #include "version.h"
> #include "mailmap.h"
> +#include "gpg-interface.h"
>
> /* Set a default date-time format for git log ("log.date" config variable) */
> static const char *default_date_mode = NULL;
> @@ -364,7 +365,8 @@ static int git_log_config(const char *var, const char
> *value, void *cb)
> use_mailmap_config = git_config_bool(var, value);
> return 0;
> }
> -
> + if (git_gpg_config(var, value, cb) < 0)
> + return -1;
> if (grep_config(var, value, cb) < 0)
> return -1;
Hmph. I do not particularly like the way the call to grep_config()
loses information by not ignoring its return value and always
returning -1, but I'll let it pass for this patch.
> return git_diff_ui_config(var, value, cb);
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
