From: "Shawn O. Pearce" <spearce@spearce.org>
To: Mark Struberg <struberg@yahoo.de>,
Robin Rosenberg <robin.rosenberg@dewire.com>
Cc: git@vger.kernel.org
Subject: [PATCH] Create $GIT_DIR/objects/pack if missing during renameAndOpenPack
Date: Sun, 10 May 2009 14:30:46 -0700 [thread overview]
Message-ID: <20090510213046.GC30527@spearce.org> (raw)
In-Reply-To: <693615.98383.qm@web27802.mail.ukl.yahoo.com>
Its OK for the objects/pack directory to be missing, an empty
repository doesn't have to have it. C Git's `git repack` will
automatically create the directory if it is not present, so we
need to do the same behavior here.
When the directory doesn't exist, we try to create it, but we
may have creation fail if another concurrent thread/process also
made the directory at the same time, hence we test once more after
creation failure before throwing the exception.
Found-by: Mark Struberg <struberg@yahoo.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
Mark Struberg <struberg@yahoo.de> wrote:
>
> If I use jgit to push to this repo it crashes because it cannot write to the pack folder. If I
> mkdir the object/pack folder in my origin repo, everything runs smooth.
Yea, that's legal. This patch should fix it.
.../src/org/spearce/jgit/transport/IndexPack.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/IndexPack.java b/org.spearce.jgit/src/org/spearce/jgit/transport/IndexPack.java
index b2bcbb7..1eb40d4 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/transport/IndexPack.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/transport/IndexPack.java
@@ -1037,6 +1037,14 @@ public PackLock renameAndOpenPack(final String lockMessage)
final File finalIdx = new File(packDir, "pack-" + name + ".idx");
final PackLock keep = new PackLock(finalPack);
+ if (!packDir.exists() && !packDir.mkdir() && !packDir.exists()) {
+ // The objects/pack directory isn't present, and we are unable
+ // to create it. There is no way to move this pack in.
+ //
+ cleanupTemporaryFiles();
+ throw new IOException("Cannot create " + packDir.getAbsolutePath());
+ }
+
if (finalPack.exists()) {
// If the pack is already present we should never replace it.
//
--
1.6.3.195.gad81
next prev parent reply other threads:[~2009-05-10 21:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-09 20:40 [JGIT] exception while pushing if no objects/pack directory exists in origin repo Mark Struberg
2009-05-10 21:30 ` Shawn O. Pearce [this message]
2009-05-10 22:59 ` [PATCH] Create $GIT_DIR/objects/pack if missing during renameAndOpenPack Robin Rosenberg
2009-05-10 23:03 ` Shawn O. Pearce
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090510213046.GC30527@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=robin.rosenberg@dewire.com \
--cc=struberg@yahoo.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).