Handle core.symlinks=false case in merge-recursive.

[git.git] / builtin-bundle.c

diff --git a/builtin-bundle.c b/builtin-bundle.c
index 191ec5570f7e2d82653ff063f79b5e71218270b5..d41a413b58d139283315720d9ffba95ea595cc1d 100644 (file)
--- a/builtin-bundle.c
+++ b/builtin-bundle.c
@@ -172,7 +172,7 @@ static int verify_bundle(struct bundle_header *header)
        struct object_array refs;
        struct commit *commit;
        int i, ret = 0, req_nr;
-       const char *message = "The bundle requires these lacking revs:";
+       const char *message = "Repository lacks these prerequisite commits:";
 
        init_revisions(&revs, NULL);
        for (i = 0; i < p->nr; i++) {
@@ -267,7 +267,7 @@ static int create_bundle(struct bundle_header *header, const char *path,
                int argc, const char **argv)
 {
        int bundle_fd = -1;
-       const char **argv_boundary = xmalloc((argc + 3) * sizeof(const char *));
+       const char **argv_boundary = xmalloc((argc + 4) * sizeof(const char *));
        const char **argv_pack = xmalloc(4 * sizeof(const char *));
        int pid, in, out, i, status;
        char buffer[1024];
@@ -282,10 +282,11 @@ static int create_bundle(struct bundle_header *header, const char *path,
        write_or_die(bundle_fd, bundle_signature, strlen(bundle_signature));
 
        /* write prerequisites */
-       memcpy(argv_boundary + 2, argv + 1, argc * sizeof(const char *));
+       memcpy(argv_boundary + 3, argv + 1, argc * sizeof(const char *));
        argv_boundary[0] = "rev-list";
        argv_boundary[1] = "--boundary";
-       argv_boundary[argc + 1] = NULL;
+       argv_boundary[2] = "--pretty=oneline";
+       argv_boundary[argc + 2] = NULL;
        out = -1;
        pid = fork_with_pipe(argv_boundary, NULL, &out);
        if (pid < 0)