X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin-for-each-ref.c;h=784733b25d21f292c6ac895ba34d0a7b88b3073f;hb=b11cf09043f18b368ec0d988f064ea21247c843d;hp=91e8f95fd20215cae72e206a691370c71dbc575e;hpb=fc917ad6b294366d3afc7a14b1bfe41fa8c567a2;p=git.git diff --git a/builtin-for-each-ref.c b/builtin-for-each-ref.c index 91e8f95fd..784733b25 100644 --- a/builtin-for-each-ref.c +++ b/builtin-for-each-ref.c @@ -339,8 +339,11 @@ static const char *copy_name(const char *buf) static const char *copy_email(const char *buf) { const char *email = strchr(buf, '<'); - const char *eoemail = strchr(email, '>'); - if (!email || !eoemail) + const char *eoemail; + if (!email) + return ""; + eoemail = strchr(email, '>'); + if (!eoemail) return ""; return xmemdupz(email, eoemail + 1 - email); } @@ -902,7 +905,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix) OPT_END(), }; - parse_options(argc, argv, opts, for_each_ref_usage, 0); + parse_options(argc, argv, prefix, opts, for_each_ref_usage, 0); if (maxcount < 0) { error("invalid --count argument: `%d'", maxcount); usage_with_options(for_each_ref_usage, opts);