[PATCH 3/3] git-bundle: prevent overwriting existing bundles

Johannes Schindelin· Mar 9, 2007, 02:50 UTC · lore

Not only does it prevent accidentally losing older bundles, but it also fixes a subtle bug: when writing into an existing bundle, git-pack-objects would not truncate the bundle. Therefore, fetching from the bundle would trigger an error in unpack-objects: "fatal: pack has junk at the end".

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---

	Alternatively, we could use O_TRUNC instead of O_EXCL, but
	I think it makes sense to refuse to overwrite existing
	bundles.

	Mark, I guess this is what triggered the bug you were reporting.

 builtin-bundle.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Show changes to builtin-bundle.c +2 −2

diff --git a/builtin-bundle.c b/builtin-bundle.c
index ca3de60..5ebba0b 100644
--- a/builtin-bundle.c
+++ b/builtin-bundle.c
@@ -268,9 +268,9 @@ static int create_bundle(struct bundle_header *header, const char *path,
 	struct rev_info revs;
 
 	bundle_fd = (!strcmp(path, "-") ? 1 :
-			open(path, O_CREAT | O_WRONLY, 0666));
+			open(path, O_CREAT | O_EXCL | O_WRONLY, 0666));
 	if (bundle_fd < 0)
-		return error("Could not write to '%s'", path);
+		return error("Could not create '%s'", path);
 
 	/* write signature */
 	write_or_die(bundle_fd, bundle_signature, strlen(bundle_signature));

-- 
1.5.0.3.2601.gc1e5-dirty

Shawn O. Pearce· Mar 9, 2007, 02:59 UTC · re: Johannes Schindelin · lore

Re: [PATCH 3/3] git-bundle: prevent overwriting existing bundles

Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:

>  	if (bundle_fd < 0)
> -		return error("Could not write to '%s'", path);
> +		return error("Could not create '%s'", path);

I hate to be a nit, but what about?

> +		return error("Could not create '%s': %s", path, strerror(errno));

-- 
Shawn.

Johannes Schindelin· Mar 9, 2007, 03:05 UTC · re: Shawn O. Pearce · lore

Re: [PATCH 3/3] git-bundle: prevent overwriting existing bundles

Hi,

On Thu, 8 Mar 2007, Shawn O. Pearce wrote:

Show 8 quoted lines

> Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> >  	if (bundle_fd < 0)
> > -		return error("Could not write to '%s'", path);
> > +		return error("Could not create '%s'", path);
> 
> I hate to be a nit, but what about?
> 
> > +		return error("Could not create '%s': %s", path, strerror(errno));

ACK

patch, 3 partsgit-bundle: prevent overwriting existing bundles