undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

report_refname_conflict(): inline function

Browse Source 
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>
This commit is contained in:
Michael Haggerty 2015-05-11 17:25:08 +02:00 committed by Junio C Hamano
parent 8bfac19ab4
commit 385e8af5a2
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
refs.c
View File

@ -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;
}