From: Clemens Buchacher <drizzd@aon.at>
To: git@vger.kernel.org
Subject: [PATCH] ignore trailing slash when creating leading directories
Date: Tue, 2 Sep 2008 10:19:09 +0200 [thread overview]
Message-ID: <20080902081909.GA2059@localhost> (raw)
'git clone <repo> path/' (note the trailing slash) fails, because the
entire path is interpreted as leading directories. So when mkdir tries to
create the actual path, it already exists.
This makes sure a trailing slash is ignored.
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
---
builtin-clone.c | 7 ++++---
sha1_file.c | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/builtin-clone.c b/builtin-clone.c
index c0e3086..4f945ad 100644
--- a/builtin-clone.c
+++ b/builtin-clone.c
@@ -422,10 +422,11 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
if (!option_bare) {
junk_work_tree = work_tree;
if (safe_create_leading_directories_const(work_tree) < 0)
- die("could not create leading directories of '%s'",
- work_tree);
+ die("could not create leading directories of '%s': %s",
+ work_tree, strerror(errno));
if (mkdir(work_tree, 0755))
- die("could not create work tree dir '%s'.", work_tree);
+ die("could not create work tree dir '%s': %s.",
+ work_tree, strerror(errno));
set_git_work_tree(work_tree);
}
junk_git_dir = git_dir;
diff --git a/sha1_file.c b/sha1_file.c
index 9ee1ed1..3cb9414 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -97,7 +97,7 @@ int safe_create_leading_directories(char *path)
while (pos) {
pos = strchr(pos, '/');
- if (!pos)
+ if (!pos || !*(pos + 1))
break;
*pos = 0;
if (!stat(path, &st)) {
--
1.6.0
next reply other threads:[~2008-09-02 8:20 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-02 8:19 Clemens Buchacher [this message]
2008-09-02 18:38 ` [PATCH] ignore trailing slash when creating leading directories Junio C Hamano
2008-09-02 19:13 ` Clemens Buchacher
2008-09-02 20:07 ` [PATCH v2] ignore trailing slashes " Clemens Buchacher
2008-09-02 20:36 ` [PATCH] ignore trailing slash " Junio C Hamano
2008-09-02 21:10 ` Junio C Hamano
2008-09-03 19:02 ` Clemens Buchacher
2008-09-03 18:55 ` [PATCH] clone: fix creation of explicitly named target directory Clemens Buchacher
2008-09-03 19:24 ` Junio C Hamano
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=20080902081909.GA2059@localhost \
--to=drizzd@aon.at \
--cc=git@vger.kernel.org \
/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).