diff --git a/builtin-for-each-ref.c b/builtin-for-each-ref.c
index cfff686ac8e151c9624788e27dda9cda268e41e8..d091e04af9549b70a1e15a4b845383056e71932e 100644 (file)
--- a/builtin-for-each-ref.c
+++ b/builtin-for-each-ref.c
static const char *copy_email(const char *buf)
{
const char *email = strchr(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);
}
return "";
return xmemdupz(email, eoemail + 1 - email);
}
if (formatp) {
formatp++;
if (!strcmp(formatp, "short"))
if (formatp) {
formatp++;
if (!strcmp(formatp, "short"))
- refname = shorten_unambiguous_ref(refname, 0);
+ refname = shorten_unambiguous_ref(refname,
+ warn_ambiguous_refs);
else
die("unknown %.*s format %s",
(int)(formatp - name), name, formatp);
else
die("unknown %.*s format %s",
(int)(formatp - name), name, formatp);
sort = default_sort();
sort_atom_limit = used_atom_cnt;
sort = default_sort();
sort_atom_limit = used_atom_cnt;
+ /* for warn_ambiguous_refs */
+ git_config(git_default_config, NULL);
+
memset(&cbdata, 0, sizeof(cbdata));
cbdata.grab_pattern = argv;
for_each_ref(grab_single_ref, &cbdata);
memset(&cbdata, 0, sizeof(cbdata));
cbdata.grab_pattern = argv;
for_each_ref(grab_single_ref, &cbdata);