From: Christian Couder <christian.couder@gmail.com>
To: Prathamesh Chavan <pc44800@gmail.com>
Cc: git <git@vger.kernel.org>, Stefan Beller <sbeller@google.com>
Subject: Re: [GSoC][PATCH 6/8] submodule: port submodule subcommand 'deinit' from shell to C
Date: Wed, 19 Jul 2017 16:04:33 +0200 [thread overview]
Message-ID: <CAP8UFD07w=57kTazLxrEYUq5jaCDp0B3SJevZM3BBoUhsJUj=w@mail.gmail.com> (raw)
In-Reply-To: <20170718204904.3768-7-pc44800@gmail.com>
On Tue, Jul 18, 2017 at 10:49 PM, Prathamesh Chavan <pc44800@gmail.com> wrote:
> +static void deinit_submodule(const struct cache_entry *list_item,
> + void *cb_data)
> +{
> + struct deinit_cb *info = cb_data;
> + const struct submodule *sub;
> + char *displaypath = NULL;
> + struct child_process cp_config = CHILD_PROCESS_INIT;
> + struct strbuf sb_config = STRBUF_INIT;
> + char *sm_path = xstrdup(list_item->name);
If I understood the previous rounds correctly, list_item->name is
duplicated because it is changed below...
> + char *sub_git_dir = xstrfmt("%s/.git", sm_path);
> + struct stat st;
> +
> + sub = submodule_from_path(null_sha1, sm_path);
> +
> + if (!sub || !sub->name)
> + goto cleanup;
> +
> + displaypath = get_submodule_displaypath(sm_path, info->prefix);
> +
> + /* remove the submodule work tree (unless the user already did it) */
> + if (is_directory(sm_path)) {
> + /* protect submodules containing a .git directory */
> + if (is_git_directory(sub_git_dir))
> + die(_("Submodule work tree '%s' contains a .git "
> + "directory use 'rm -rf' if you really want "
> + "to remove it including all of its history"),
> + displaypath);
> +
> + if (!info->force) {
> + struct child_process cp_rm = CHILD_PROCESS_INIT;
> + cp_rm.git_cmd = 1;
> + argv_array_pushl(&cp_rm.args, "rm", "-qn", sm_path,
> + NULL);
> +
> + /* list_item->name is changed by cmd_rm() below */
... but it looks like cmd_rm() is not used anymore below, so this
comment is outdated and I wonder if duplicated list_item->name is
still needed.
> + if (run_command(&cp_rm))
> + die(_("Submodule work tree '%s' contains local "
> + "modifications; use '-f' to discard them"),
> + displaypath);
> + }
> +
> + if (!lstat(sm_path, &st)) {
> + struct strbuf sb_rm = STRBUF_INIT;
> + strbuf_addstr(&sb_rm, sm_path);
> +
> + if (!remove_dir_recursively(&sb_rm, 0)) {
> + if (!info->quiet)
> + printf(_("Cleared directory '%s'\n"),
> + displaypath);
> + } else {
> + if (!info->quiet)
> + printf(_("Could not remove submodule work tree '%s'\n"),
> + displaypath);
> + }
Nit: maybe this could be:
struct strbuf sb_rm = STRBUF_INIT;
const char *format;
strbuf_addstr(&sb_rm, sm_path);
if (!remove_dir_recursively(&sb_rm, 0))
format = _("Cleared directory '%s'\n");
else
format = _("Could not remove submodule
work tree '%s'\n");
if (!info->quiet)
printf(format, displaypath);
> + strbuf_release(&sb_rm);
> + }
> + }
next prev parent reply other threads:[~2017-07-19 14:04 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-18 20:48 [GSoC][PATCH 0/8] Update: Week 9 Prathamesh Chavan
2017-07-18 20:48 ` [GSoC][PATCH 1/8] submodule--helper: introduce get_submodule_displaypath() Prathamesh Chavan
2017-07-18 20:48 ` [GSoC][PATCH 2/8] submodule--helper: introduce for_each_submodule_list() Prathamesh Chavan
2017-07-18 20:48 ` [GSoC][PATCH 3/8] submodule: port set_name_rev() from shell to C Prathamesh Chavan
2017-07-18 20:49 ` [GSoC][PATCH 4/8] submodule: port submodule subcommand 'status' " Prathamesh Chavan
2017-07-18 21:39 ` Stefan Beller
2017-07-18 22:32 ` Junio C Hamano
2017-07-18 22:44 ` Stefan Beller
2017-07-18 22:47 ` Junio C Hamano
2017-07-18 20:49 ` [GSoC][PATCH 5/8] submodule: port submodule subcommand 'sync' " Prathamesh Chavan
2017-07-18 22:23 ` Stefan Beller
2017-07-20 19:36 ` Prathamesh Chavan
2017-07-20 19:57 ` Stefan Beller
2017-07-18 20:49 ` [GSoC][PATCH 6/8] submodule: port submodule subcommand 'deinit' " Prathamesh Chavan
2017-07-19 14:04 ` Christian Couder [this message]
2017-07-18 20:49 ` [GSoC][PATCH 7/8] diff: change scope of the function count_lines() Prathamesh Chavan
2017-07-18 20:49 ` [GSoC][PATCH 8/8] submodule: port submodule subcommand 'summary' from shell to C Prathamesh Chavan
2017-07-19 14:53 ` Christian Couder
-- strict thread matches above, loose matches on Subject: below --
2017-07-10 22:45 [GSoC] Update: Week 8 Prathamesh Chavan
2017-07-10 22:54 ` [GSoC][PATCH 1/8] submodule--helper: introduce get_submodule_displaypath() Prathamesh Chavan
2017-07-10 22:54 ` [GSoC][PATCH 6/8] submodule: port submodule subcommand 'deinit' from shell to C Prathamesh Chavan
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='CAP8UFD07w=57kTazLxrEYUq5jaCDp0B3SJevZM3BBoUhsJUj=w@mail.gmail.com' \
--to=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=pc44800@gmail.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).