X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=builtin%2Freceive-pack.c;h=d8e2c5fca7902d6d9a9e8300e129d58ad7a98192;hb=25197ebe7f813407b028a2c304ff8ee58da40a16;hp=d634b5a3d5212b8e49217d94430c294b911dfc7d;hpb=6a7f71d376becc1a5b0357b682dd0c20842104b0;p=git.git diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index d634b5a3d..d8e2c5fca 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -530,7 +530,7 @@ 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 = @@ -740,7 +740,7 @@ static int add_refs_from_alternate(struct alternate_object_database *e, void *un const struct ref *extra; e->name[-1] = '\0'; - other = xstrdup(make_absolute_path(e->base)); + other = xstrdup(real_path(e->base)); e->name[-1] = '/'; len = strlen(other); @@ -778,6 +778,8 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix) char *dir = NULL; struct command *commands; + packet_trace_identity("receive-pack"); + argv++; for (i = 1; i < argc; i++) { const char *arg = *argv++;