From: Stefan Beller <sbeller@google.com>
To: sbeller@google.com, gitster@pobox.com
Cc: git@vger.kernel.org, bmwill@google.com, novalis@novalis.org,
sandals@crustytoothpaste.net, hvoigt@hvoigt.net,
jrnieder@gmail.com, ramsay@ramsayjones.plus.com,
Valery Tolstov <me@vtolstov.org>
Subject: [PATCH 02/19] submodule--helper.c: remove duplicate code
Date: Tue, 14 Mar 2017 14:46:25 -0700 [thread overview]
Message-ID: <20170314214642.7701-3-sbeller@google.com> (raw)
In-Reply-To: <20170314214642.7701-1-sbeller@google.com>
From: Valery Tolstov <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>
Reviewed-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
---
builtin/submodule--helper.c | 22 ++--------------------
1 file changed, 2 insertions(+), 20 deletions(-)
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 899dc334e3..86bafe1660 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -579,9 +579,7 @@ 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;
struct string_list reference = STRING_LIST_INIT_NODUP;
char *sm_alternate = NULL, *error_strategy = NULL;
@@ -653,27 +651,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);
@@ -689,7 +672,6 @@ static int module_clone(int argc, const char **argv, const char *prefix)
free(error_strategy);
strbuf_release(&sb);
- strbuf_release(&rel_path);
free(sm_gitdir);
free(path);
free(p);
--
2.12.0.rc1.49.g0cfd38c5f6.dirty
next prev parent reply other threads:[~2017-03-14 21:46 UTC|newest]
Thread overview: 100+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20170223225735.10994-1-sbeller@google.com/>
2017-03-02 0:47 ` [RFCv6 PATCH 00/18] Checkout aware of Submodules! Stefan Beller
2017-03-02 0:47 ` [PATCH 01/18] lib-submodule-update.sh: reorder create_lib_submodule_repo Stefan Beller
2017-03-02 0:47 ` [PATCH 02/18] lib-submodule-update.sh: do not use ./. as submodule remote Stefan Beller
2017-03-02 0:47 ` [PATCH 03/18] lib-submodule-update: teach test_submodule_content the -C <dir> flag Stefan Beller
2017-03-02 2:11 ` Eric Wong
2017-03-06 20:30 ` Stefan Beller
2017-03-06 20:35 ` Stefan Beller
2017-03-02 0:47 ` [PATCH 04/18] lib-submodule-update.sh: replace sha1 by hash Stefan Beller
2017-03-02 0:47 ` [PATCH 05/18] lib-submodule-update.sh: define tests for recursing into submodules Stefan Beller
2017-03-02 0:47 ` [PATCH 06/18] make is_submodule_populated gently Stefan Beller
2017-03-02 0:47 ` [PATCH 07/18] connect_work_tree_and_git_dir: safely create leading directories Stefan Beller
2017-03-02 0:47 ` [PATCH 08/18] update submodules: add submodule config parsing Stefan Beller
2017-03-02 0:47 ` [PATCH 09/18] update submodules: add a config option to determine if submodules are updated Stefan Beller
2017-03-02 0:47 ` [PATCH 10/18] submodules: introduce check to see whether to touch a submodule Stefan Beller
2017-03-02 0:47 ` [PATCH 11/18] update submodules: move up prepare_submodule_repo_env Stefan Beller
2017-03-02 0:47 ` [PATCH 12/18] update submodules: add submodule_move_head Stefan Beller
2017-03-02 0:47 ` [PATCH 13/18] unpack-trees: pass old oid to verify_clean_submodule Stefan Beller
2017-03-02 0:47 ` [PATCH 14/18] unpack-trees: check if we can perform the operation for submodules Stefan Beller
2017-03-02 0:47 ` [PATCH 15/18] read-cache, remove_marked_cache_entries: wipe selected submodules Stefan Beller
2017-03-02 0:47 ` [PATCH 16/18] entry.c: update submodules when interesting Stefan Beller
2017-03-02 0:47 ` [PATCH 17/18] builtin/checkout: add --recurse-submodules switch Stefan Beller
2017-03-02 0:47 ` [PATCH 18/18] builtin/read-tree: " Stefan Beller
2017-03-06 20:59 ` [RFCv7 PATCH 00/18] Checkout aware of Submodules! Stefan Beller
2017-03-06 20:59 ` [PATCH 01/18] lib-submodule-update.sh: reorder create_lib_submodule_repo Stefan Beller
2017-03-06 20:59 ` [PATCH 02/18] lib-submodule-update.sh: do not use ./. as submodule remote Stefan Beller
2017-03-06 20:59 ` [PATCH 03/18] lib-submodule-update: teach test_submodule_content the -C <dir> flag Stefan Beller
2017-03-06 22:21 ` Junio C Hamano
2017-03-06 20:59 ` [PATCH 04/18] lib-submodule-update.sh: replace sha1 by hash Stefan Beller
2017-03-06 20:59 ` [PATCH 05/18] lib-submodule-update.sh: define tests for recursing into submodules Stefan Beller
2017-03-07 22:26 ` Junio C Hamano
2017-03-06 20:59 ` [PATCH 06/18] make is_submodule_populated gently Stefan Beller
2017-03-06 20:59 ` [PATCH 07/18] connect_work_tree_and_git_dir: safely create leading directories Stefan Beller
2017-03-06 20:59 ` [PATCH 08/18] update submodules: add submodule config parsing Stefan Beller
2017-03-06 20:59 ` [PATCH 09/18] update submodules: add a config option to determine if submodules are updated Stefan Beller
2017-03-06 20:59 ` [PATCH 10/18] submodules: introduce check to see whether to touch a submodule Stefan Beller
2017-03-06 20:59 ` [PATCH 11/18] update submodules: move up prepare_submodule_repo_env Stefan Beller
2017-03-06 20:59 ` [PATCH 12/18] update submodules: add submodule_move_head Stefan Beller
2017-03-06 20:59 ` [PATCH 13/18] unpack-trees: pass old oid to verify_clean_submodule Stefan Beller
2017-03-06 20:59 ` [PATCH 14/18] unpack-trees: check if we can perform the operation for submodules Stefan Beller
2017-03-06 20:59 ` [PATCH 15/18] read-cache, remove_marked_cache_entries: wipe selected submodules Stefan Beller
2017-03-07 22:42 ` Junio C Hamano
2017-03-07 23:37 ` Stefan Beller
2017-03-08 1:14 ` Junio C Hamano
2017-03-08 22:39 ` Stefan Beller
2017-03-08 23:37 ` Junio C Hamano
2017-03-06 20:59 ` [PATCH 16/18] entry.c: update submodules when interesting Stefan Beller
2017-03-07 22:42 ` Junio C Hamano
2017-03-07 23:04 ` Junio C Hamano
2017-03-07 23:08 ` Stefan Beller
2017-03-08 1:08 ` Junio C Hamano
2017-03-06 20:59 ` [PATCH 17/18] builtin/checkout: add --recurse-submodules switch Stefan Beller
2017-03-06 20:59 ` [PATCH 18/18] builtin/read-tree: " Stefan Beller
2017-03-07 22:42 ` Junio C Hamano
2017-03-09 22:15 ` [RFCv8 PATCH 00/17] Checkout aware of Submodules! Stefan Beller
2017-03-09 22:15 ` [PATCH 01/17] lib-submodule-update.sh: reorder create_lib_submodule_repo Stefan Beller
2017-03-09 22:15 ` [PATCH 02/17] lib-submodule-update.sh: do not use ./. as submodule remote Stefan Beller
2017-03-09 22:15 ` [PATCH 03/17] lib-submodule-update: teach test_submodule_content the -C <dir> flag Stefan Beller
2017-03-09 22:15 ` [PATCH 04/17] lib-submodule-update.sh: replace sha1 by hash Stefan Beller
2017-03-09 22:15 ` [PATCH 05/17] lib-submodule-update.sh: define tests for recursing into submodules Stefan Beller
2017-03-09 22:15 ` [PATCH 06/17] make is_submodule_populated gently Stefan Beller
2017-03-09 22:15 ` [PATCH 07/17] connect_work_tree_and_git_dir: safely create leading directories Stefan Beller
2017-03-09 23:29 ` Brandon Williams
2017-03-12 7:06 ` Junio C Hamano
2017-03-09 22:15 ` [PATCH 08/17] update submodules: add submodule config parsing Stefan Beller
2017-03-09 22:15 ` [PATCH 09/17] update submodules: add a config option to determine if submodules are updated Stefan Beller
2017-03-09 22:15 ` [PATCH 10/17] submodules: introduce check to see whether to touch a submodule Stefan Beller
2017-03-09 22:15 ` [PATCH 11/17] update submodules: move up prepare_submodule_repo_env Stefan Beller
2017-03-09 22:15 ` [PATCH 12/17] update submodules: add submodule_move_head Stefan Beller
2017-03-09 23:37 ` Brandon Williams
2017-03-12 7:09 ` Junio C Hamano
2017-03-13 17:24 ` Brandon Williams
2017-03-13 20:50 ` Stefan Beller
2017-03-09 23:40 ` Brandon Williams
2017-03-09 23:43 ` Brandon Williams
2017-03-09 22:15 ` [PATCH 13/17] unpack-trees: pass old oid to verify_clean_submodule Stefan Beller
2017-03-09 22:15 ` [PATCH 14/17] unpack-trees: check if we can perform the operation for submodules Stefan Beller
2017-03-09 22:15 ` [PATCH 15/17] entry.c: create submodules when interesting Stefan Beller
2017-03-09 22:15 ` [PATCH 16/17] builtin/checkout: add --recurse-submodules switch Stefan Beller
2017-03-09 22:15 ` [PATCH 17/17] builtin/read-tree: " Stefan Beller
2017-03-14 21:46 ` [PATCHv9 00/19] Checkout aware of Submodules! Stefan Beller
2017-03-14 21:46 ` [PATCH 01/19] connect_work_tree_and_git_dir: safely create leading directories Stefan Beller
2017-03-14 21:46 ` Stefan Beller [this message]
2017-03-14 21:46 ` [PATCH 03/19] lib-submodule-update.sh: reorder create_lib_submodule_repo Stefan Beller
2017-03-14 21:46 ` [PATCH 04/19] lib-submodule-update.sh: do not use ./. as submodule remote Stefan Beller
2017-03-14 21:46 ` [PATCH 05/19] lib-submodule-update: teach test_submodule_content the -C <dir> flag Stefan Beller
2017-03-14 21:46 ` [PATCH 06/19] lib-submodule-update.sh: replace sha1 by hash Stefan Beller
2017-03-14 21:46 ` [PATCH 07/19] lib-submodule-update.sh: define tests for recursing into submodules Stefan Beller
2017-03-14 21:46 ` [PATCH 08/19] make is_submodule_populated gently Stefan Beller
2017-03-14 21:46 ` [PATCH 09/19] update submodules: add submodule config parsing Stefan Beller
2017-03-14 21:46 ` [PATCH 10/19] update submodules: add a config option to determine if submodules are updated Stefan Beller
2017-03-14 21:46 ` [PATCH 11/19] submodules: introduce check to see whether to touch a submodule Stefan Beller
2017-03-14 21:46 ` [PATCH 12/19] update submodules: move up prepare_submodule_repo_env Stefan Beller
2017-03-14 21:46 ` [PATCH 13/19] submodule.c: get_super_prefix_or_empty Stefan Beller
2017-03-14 21:46 ` [PATCH 14/19] update submodules: add submodule_move_head Stefan Beller
2017-03-14 21:46 ` [PATCH 15/19] unpack-trees: pass old oid to verify_clean_submodule Stefan Beller
2017-03-14 21:46 ` [PATCH 16/19] unpack-trees: check if we can perform the operation for submodules Stefan Beller
2017-03-14 21:46 ` [PATCH 17/19] entry.c: create submodules when interesting Stefan Beller
2017-03-14 21:46 ` [PATCH 18/19] builtin/checkout: add --recurse-submodules switch Stefan Beller
2017-03-14 21:46 ` [PATCH 19/19] builtin/read-tree: " Stefan Beller
2017-03-15 0:41 ` [PATCHv9 00/19] Checkout aware of Submodules! 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=20170314214642.7701-3-sbeller@google.com \
--to=sbeller@google.com \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hvoigt@hvoigt.net \
--cc=jrnieder@gmail.com \
--cc=me@vtolstov.org \
--cc=novalis@novalis.org \
--cc=ramsay@ramsayjones.plus.com \
--cc=sandals@crustytoothpaste.net \
/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).