Re: [PATCH] git-bundle: assorted fixes
On Thu, 22 Feb 2007, Mark Levedahl wrote:
Show 13 quoted lines
> Johannes Schindelin wrote:
>
> > Mark wrote:
> >
> > > 2) git bundle verify reports only a single sha1 if prerequisites are
> > > not met.
> >
> > With the two follow-up patches I sent, this issue should be resolved,
> > no?
> >
> I missed one of your patches, adding that, the problem is incompletely
> fixed: all missing commits are shown, but only as raw hashes (e.g., the
> 1-line commit message is not there to describe what is missing).
Okay, how about this on top:
-- snipsnap --
builtin-bundle.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/builtin-bundle.c b/builtin-bundle.c
index 4ac06f9..d11435b 100644
--- a/builtin-bundle.c
+++ b/builtin-bundle.c
@@ -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)
Johannes Schindelin <johannes.schindelin@gmx.de>