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

ref_remote_duplicates(): extract a function handle_duplicate()

Browse Source 
It will become more complex in a moment.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty 2013-10-30 06:33:10 +01:00 committed by Junio C Hamano
parent b9afe6654d
commit df02ebdac8
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
remote.c
View File

@ -745,6 +745,15 @@ int for_each_remote(each_remote_fn fn, void *priv)
return result; return result;
} }
static void handle_duplicate(struct ref *ref1, struct ref *ref2)
{
if (strcmp(ref1->name, ref2->name))
die("%s tracks both %s and %s",
ref2->peer_ref->name, ref1->name, ref2->name);
free(ref2->peer_ref);
free(ref2);
}
struct ref *ref_remove_duplicates(struct ref *ref_map) struct ref *ref_remove_duplicates(struct ref *ref_map)
{ {
struct string_list refs = STRING_LIST_INIT_NODUP; struct string_list refs = STRING_LIST_INIT_NODUP;
@ -766,14 +775,7 @@ struct ref *ref_remove_duplicates(struct ref *ref_map)
if (item->util) { if (item->util) {
/* Entry already existed */ /* Entry already existed */
if (strcmp(((struct ref *)item->util)->name, handle_duplicate((struct ref *)item->util, ref);
ref->name))
die("%s tracks both %s and %s",
ref->peer_ref->name,
((struct ref *)item->util)->name,
ref->name);
free(ref->peer_ref);
free(ref);
} else { } else {
*p = ref; *p = ref;
p = &ref->next; p = &ref->next;