X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=inline;f=builtin%2Freceive-pack.c;h=d634b5a3d5212b8e49217d94430c294b911dfc7d;hb=329351feeb0c08c835ac4ff05f127fbfe42a78cf;hp=29bc8d50bbe187654e8b0903627655fbb05a6aea;hpb=d5cff17edaf438bbf45a2130e9cadc0c938291d6;p=git.git diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 29bc8d50b..760817dbd 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -501,7 +501,7 @@ static void check_aliased_update(struct command *cmd, struct string_list *list) if (!(flag & REF_ISSYMREF)) return; - if ((item = string_list_lookup(dst_name, list)) == NULL) + if ((item = string_list_lookup(list, dst_name)) == NULL) return; cmd->skip_update = 1; @@ -530,11 +530,11 @@ static void check_aliased_update(struct command *cmd, struct string_list *list) static void check_aliased_updates(struct command *commands) { struct command *cmd; - struct string_list ref_list = { NULL, 0, 0, 0 }; + struct string_list ref_list = STRING_LIST_INIT_NODUP; for (cmd = commands; cmd; cmd = cmd->next) { struct string_list_item *item = - string_list_append(cmd->ref_name, &ref_list); + string_list_append(&ref_list, cmd->ref_name); item->util = (void *)cmd; } sort_string_list(&ref_list);