Home » Mailing list archives » git » 2007 » March » 8

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

Previous thread: [PATCH 2/3] git-bundle: die if a given ref is not included in bundle by Johannes Schindelin on Thursday, March 8, 2007 - 7:48 pm. (21 messages)

Next thread: Re: Advice on strategy for "temporary" commits by Jakub Narebski on Friday, March 9, 2007 - 3:15 am. (1 message)
[view original message]
From: Johannes Schindelin
Subject: [PATCH 3/3] git-bundle: prevent overwriting existing bundles
Date: Thursday, March 8, 2007 - 7:50 pm

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(-)

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

-


[ message continues ]
[view original message]
From: Shawn O. Pearce
Subject: Re: [PATCH 3/3] git-bundle: prevent overwriting existing bundles
Date: Thursday, March 8, 2007 - 7:59 pm

-- 
Shawn.
-


[ message continues ]
[view original message]
From: Johannes Schindelin
Subject: Re: [PATCH 3/3] git-bundle: prevent overwriting existing bundles
Date: Thursday, March 8, 2007 - 8:05 pm

Hi,


ACK

-


[ message continues ]
Previous thread: [PATCH 2/3] git-bundle: die if a given ref is not included in bundle by Johannes Schindelin on Thursday, March 8, 2007 - 7:48 pm. (21 messages)

Next thread: Re: Advice on strategy for "temporary" commits by Jakub Narebski on Friday, March 9, 2007 - 3:15 am. (1 message)