From: Stefan Beller <sbeller@google.com>
To: gitster@pobox.com, git@vger.kernel.org
Cc: norio.nomura@gmail.com, Stefan Beller <sbeller@google.com>
Subject: [PATCH 3/4] submodule--helper clone: remove double path checking
Date: Wed, 30 Mar 2016 17:17:36 -0700 [thread overview]
Message-ID: <1459383457-6848-4-git-send-email-sbeller@google.com> (raw)
In-Reply-To: <1459383457-6848-1-git-send-email-sbeller@google.com>
Just a few lines after the deleted code we call
safe_create_leading_directories_const(path + "/.git")
so the check is done twice without action in between.
Remove the first check.
Signed-off-by: Stefan Beller <sbeller@google.com>
---
builtin/submodule--helper.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 88002ca..914e561 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -212,11 +212,7 @@ static int module_clone(int argc, const char **argv, const char *prefix)
}
/* Write a .git file in the submodule to redirect to the superproject. */
- if (safe_create_leading_directories_const(path) < 0)
- die(_("could not create directory '%s'"), path);
-
strbuf_addf(&sb, "%s/.git", path);
-
if (safe_create_leading_directories_const(sb.buf) < 0)
die(_("could not create leading directories of '%s'"), sb.buf);
submodule_dot_git = fopen(sb.buf, "w");
--
2.5.0.264.g4004fdc.dirty
next prev parent reply other threads:[~2016-03-31 0:17 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-31 0:17 [PATCH 0/4] Fix relative path issues in recursive submodules Stefan Beller
2016-03-31 0:17 ` [PATCH 1/4] recursive submodules: test for relative paths Stefan Beller
2016-03-31 16:33 ` Junio C Hamano
2016-03-31 16:47 ` Stefan Beller
2016-03-31 0:17 ` [PATCH 2/4] submodule--helper clone: simplify path check Stefan Beller
2016-03-31 0:32 ` Jacob Keller
2016-03-31 7:31 ` Eric Sunshine
2016-03-31 17:17 ` Stefan Beller
2016-03-31 16:36 ` Junio C Hamano
2016-03-31 17:04 ` Eric Sunshine
2016-03-31 0:17 ` Stefan Beller [this message]
2016-03-31 16:44 ` [PATCH 3/4] submodule--helper clone: remove double path checking Junio C Hamano
2016-03-31 0:17 ` [PATCH 4/4] submodule--helper: use relative path if possible Stefan Beller
2016-03-31 16:59 ` Junio C Hamano
2016-03-31 19:22 ` Stefan Beller
2016-03-31 17:04 ` [PATCH 0/4] Fix relative path issues in recursive submodules Junio C Hamano
2016-03-31 17:20 ` Stefan Beller
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=1459383457-6848-4-git-send-email-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=norio.nomura@gmail.com \
/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).