git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
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 2/4] submodule--helper clone: simplify path check
Date: Wed, 30 Mar 2016 17:17:35 -0700	[thread overview]
Message-ID: <1459383457-6848-3-git-send-email-sbeller@google.com> (raw)
In-Reply-To: <1459383457-6848-1-git-send-email-sbeller@google.com>

The calling shell code makes sure that `path` is non null and non empty.
(side note: it cannot be null as just three lines before it is passed
to safe_create_leading_directories_const which would crash as you feed
it null).

Signed-off-by: Stefan Beller <sbeller@google.com>
---
 builtin/submodule--helper.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index f4c3eff..88002ca 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -215,10 +215,7 @@ static int module_clone(int argc, const char **argv, const char *prefix)
 	if (safe_create_leading_directories_const(path) < 0)
 		die(_("could not create directory '%s'"), path);
 
-	if (path && *path)
-		strbuf_addf(&sb, "%s/.git", path);
-	else
-		strbuf_addstr(&sb, ".git");
+	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);
-- 
2.5.0.264.g4004fdc.dirty

  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 ` Stefan Beller [this message]
2016-03-31  0:32   ` [PATCH 2/4] submodule--helper clone: simplify path check 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 ` [PATCH 3/4] submodule--helper clone: remove double path checking Stefan Beller
2016-03-31 16:44   ` 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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1459383457-6848-3-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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).