提交 385e8af5 编写于 作者: M Michael Haggerty 提交者: Junio C Hamano

report_refname_conflict(): inline function

It wasn't pulling its weight. And we are about to need code similar to
this where no ref_entry is available and with more diverse error
messages. Rather than try to generalize the function, just inline it.
Signed-off-by: NMichael Haggerty <mhagger@alum.mit.edu>
上级 8bfac19a
......@@ -857,12 +857,6 @@ static int nonmatching_ref_fn(struct ref_entry *entry, void *vdata)
return 1;
}
static void report_refname_conflict(struct ref_entry *entry,
const char *refname)
{
error("'%s' exists; cannot create '%s'", entry->name, refname);
}
/*
* Return true iff a reference named refname could be created without
* conflicting with the name of an existing reference in dir. If
......@@ -918,7 +912,7 @@ static int is_refname_available(const char *refname,
*/
return 1;
}
report_refname_conflict(entry, refname);
error("'%s' exists; cannot create '%s'", entry->name, refname);
return 0;
}
......@@ -969,7 +963,7 @@ static int is_refname_available(const char *refname,
if (!do_for_each_entry_in_dir(dir, 0, nonmatching_ref_fn, &data))
return 1;
report_refname_conflict(data.found, refname);
error("'%s' exists; cannot create '%s'", data.found->name, refname);
return 0;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册