git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Valery Tolstov <me@vtolstov.org>
To: git@vger.kernel.org
Cc: sbeller@google.com, me@vtolstov.org, gitster@pobox.com
Subject: [PATCH v2 2/2] submodule--helper.c: remove duplicate code
Date: Thu,  9 Mar 2017 03:03:52 +0300	[thread overview]
Message-ID: <20170309000352.18330-3-me@vtolstov.org> (raw)
In-Reply-To: <20170309000352.18330-1-me@vtolstov.org>

Remove code fragment from module_clone that duplicates functionality
of connect_work_tree_and_git_dir in dir.c

Signed-off-by: Valery Tolstov <me@vtolstov.org>
---
 builtin/submodule--helper.c | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 899dc334e..405cbea07 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -579,7 +579,6 @@ static int module_clone(int argc, const char **argv, const char *prefix)
 	const char *name = NULL, *url = NULL, *depth = NULL;
 	int quiet = 0;
 	int progress = 0;
-	FILE *submodule_dot_git;
 	char *p, *path = NULL, *sm_gitdir;
 	struct strbuf rel_path = STRBUF_INIT;
 	struct strbuf sb = STRBUF_INIT;
@@ -653,27 +652,12 @@ static int module_clone(int argc, const char **argv, const char *prefix)
 		strbuf_reset(&sb);
 	}
 
-	/* Write a .git file in the submodule to redirect to the superproject. */
-	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");
-	if (!submodule_dot_git)
-		die_errno(_("cannot open file '%s'"), sb.buf);
-
-	fprintf_or_die(submodule_dot_git, "gitdir: %s\n",
-		       relative_path(sm_gitdir, path, &rel_path));
-	if (fclose(submodule_dot_git))
-		die(_("could not close file %s"), sb.buf);
-	strbuf_reset(&sb);
-	strbuf_reset(&rel_path);
+	/* Connect module worktree and git dir */
+	connect_work_tree_and_git_dir(path, sm_gitdir);
 
-	/* Redirect the worktree of the submodule in the superproject's config */
 	p = git_pathdup_submodule(path, "config");
 	if (!p)
 		die(_("could not get submodule directory for '%s'"), path);
-	git_config_set_in_file(p, "core.worktree",
-			       relative_path(path, sm_gitdir, &rel_path));
 
 	/* setup alternateLocation and alternateErrorStrategy in the cloned submodule if needed */
 	git_config_get_string("submodule.alternateLocation", &sm_alternate);
-- 
2.12.0.192.gbdb9d28a5


  parent reply	other threads:[~2017-03-09  0:09 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-08 17:44 [PATCH] submodule--helper.c: remove duplicate code me
2017-03-08 18:53 ` Stefan Beller
2017-03-08 19:59   ` Valery Tolstov
2017-03-08 20:25     ` Stefan Beller
2017-03-08 23:05       ` Valery Tolstov
2017-03-08 23:15         ` Stefan Beller
2017-03-08 23:24           ` Junio C Hamano
2017-03-08 23:34             ` Stefan Beller
2017-03-09  0:03       ` [PATCH v2 0/2] Remove duplicate code from module_clone() Valery Tolstov
2017-03-09  0:03         ` [PATCH v2 1/2] connect_work_tree_and_git_dir: safely create leading directories Valery Tolstov
2017-03-09  0:03         ` Valery Tolstov [this message]
2017-03-09  0:38           ` [PATCH v2 2/2] submodule--helper.c: remove duplicate code Brandon Williams
2017-03-09  1:27             ` [PATCH v3 0/2] Remove duplicate code from module_clone() Valery Tolstov
2017-03-09  1:27               ` [PATCH v3 1/2] connect_work_tree_and_git_dir: safely create leading directories Valery Tolstov
2017-03-09  1:27               ` [PATCH v3 2/2] submodule--helper.c: remove duplicate code Valery Tolstov
2017-03-09 18:18                 ` Brandon Williams
2017-03-10 19:42                   ` Junio C Hamano
2017-03-10 19:49                     ` Stefan Beller
2017-03-10 20:40                       ` Junio C Hamano
2017-03-10 20:48                         ` Stefan Beller
2017-03-09 22:54                 ` Valery Tolstov
2017-03-09  0:28         ` [PATCH v2 0/2] Remove duplicate code from module_clone() Brandon Williams
2017-03-09  0:56           ` Valery Tolstov
2017-03-09 18:19             ` Brandon Williams

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=20170309000352.18330-3-me@vtolstov.org \
    --to=me@vtolstov.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=sbeller@google.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).