merge-recursive: restore accidentally dropped setting of path

diff --git a/transport-helper.c b/transport-helper.c
index 1f52c95fd87b1a02968727bde71dcc1eddc50410..cec83bd663d0f27589bd09176e38b084270f56c4 100644 (file)
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -127,6 +127,8 @@ static struct child_process *get_helper(struct transport *transport)
                argv_array_pushf(&helper->env_array, "%s=%s",
                                 GIT_DIR_ENVIRONMENT, get_git_dir());
 
+       helper->trace2_child_class = helper->args.argv[0]; /* "remote-<name>" */
+
        code = start_command(helper);
        if (code < 0 && errno == ENOENT)
                die(_("unable to find remote helper for '%s'"), data->name);