[PATCH 3/3] git-bundle: prevent overwriting existing bundles
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Mar 9, 2007, 02:50 UTC
- Message-ID
- <Pine.LNX.4.63.0703090348480.22628@wbgn013.biozentrum.uni-wuerzburg.de>
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