diff options
author | Michael Haggerty <mhagger@alum.mit.edu> | 2015-05-01 14:25:46 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-05-10 11:31:32 -0700 |
commit | 5c3f5c70e2d0466eb9a45ee7387dc574edccf87e (patch) | |
tree | 09148950ba1c7b334cf24f905ad951682343e950 | |
parent | 363431a54dd59d759a3e802e1b9099057f23f7f3 (diff) | |
download | git-5c3f5c70e2d0466eb9a45ee7387dc574edccf87e.tar.gz |
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: Michael Haggerty <mhagger@alum.mit.edu>
-rw-r--r-- | refs.c | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -863,12 +863,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 @@ -916,7 +910,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; } @@ -957,7 +951,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; } |