From: Stefan Beller <sbeller@google.com>
To: unlisted-recipients:; (no To-header on input)
Cc: git@vger.kernel.org, sandals@crustytoothpaste.net,
jrnieder@gmail.com, bmwill@google.com, gitster@pobox.com,
Stefan Beller <sbeller@google.com>
Subject: [PATCH 14/15] entry.c: update submodules when interesting
Date: Wed, 15 Feb 2017 16:38:10 -0800 [thread overview]
Message-ID: <20170216003811.18273-15-sbeller@google.com> (raw)
In-Reply-To: <20170216003811.18273-1-sbeller@google.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
---
entry.c | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/entry.c b/entry.c
index c6eea240b6..ae40611c97 100644
--- a/entry.c
+++ b/entry.c
@@ -2,6 +2,7 @@
#include "blob.h"
#include "dir.h"
#include "streaming.h"
+#include "submodule.h"
static void create_directories(const char *path, int path_len,
const struct checkout *state)
@@ -203,6 +204,13 @@ static int write_entry(struct cache_entry *ce,
return error("cannot create temporary submodule %s", path);
if (mkdir(path, 0777) < 0)
return error("cannot create submodule directory %s", path);
+ if (is_active_submodule_with_strategy(ce, SM_UPDATE_UNSPECIFIED))
+ /*
+ * force=1 is ok for any case as we did a dry
+ * run before with appropriate force setting
+ */
+ return submodule_go_from_to(ce->name,
+ NULL, oid_to_hex(&ce->oid), 0, 1);
break;
default:
return error("unknown file mode for %s in index", path);
@@ -260,6 +268,26 @@ int checkout_entry(struct cache_entry *ce,
if (!check_path(path.buf, path.len, &st, state->base_dir_len)) {
unsigned changed = ce_match_stat(ce, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);
+ /*
+ * Needs to be checked before !changed returns early,
+ * as the possibly empty directory was not changed
+ */
+ if (is_active_submodule_with_strategy(ce, SM_UPDATE_UNSPECIFIED)) {
+ int err;
+ if (!is_submodule_populated_gently(ce->name, &err)) {
+ struct stat sb;
+ if (lstat(ce->name, &sb))
+ die(_("could not stat file '%s'"), ce->name);
+ if (!(st.st_mode & S_IFDIR))
+ unlink_or_warn(ce->name);
+
+ return submodule_go_from_to(ce->name,
+ NULL, oid_to_hex(&ce->oid), 0, 1);
+ } else
+ return submodule_go_from_to(ce->name,
+ "HEAD", oid_to_hex(&ce->oid), 0, 1);
+ }
+
if (!changed)
return 0;
if (!state->force) {
--
2.12.0.rc1.16.ge4278d41a0.dirty
next prev parent reply other threads:[~2017-02-16 0:39 UTC|newest]
Thread overview: 94+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-15 0:34 [RFCv3 PATCH 00/14] Checkout aware of Submodules! Stefan Beller
2017-02-15 0:34 ` [PATCH 01/14] lib-submodule-update.sh: reorder create_lib_submodule_repo Stefan Beller
2017-02-15 1:44 ` brian m. carlson
2017-02-15 0:34 ` [PATCH 02/14] lib-submodule-update.sh: define tests for recursing into submodules Stefan Beller
2017-02-15 16:51 ` Brandon Williams
2017-02-15 18:52 ` Stefan Beller
2017-02-15 0:34 ` [PATCH 03/14] make is_submodule_populated gently Stefan Beller
2017-02-15 18:10 ` Junio C Hamano
2017-02-15 22:42 ` Stefan Beller
2017-02-15 0:34 ` [PATCH 04/14] connect_work_tree_and_git_dir: safely create leading directories Stefan Beller
2017-02-15 18:22 ` Junio C Hamano
2017-02-15 22:52 ` Stefan Beller
2017-02-15 23:19 ` Junio C Hamano
2017-02-15 0:34 ` [PATCH 05/14] update submodules: add submodule config parsing Stefan Beller
2017-02-15 18:29 ` Junio C Hamano
2017-02-15 0:34 ` [PATCH 06/14] update submodules: add a config option to determine if submodules are updated Stefan Beller
2017-02-15 0:34 ` [PATCH 07/14] update submodules: introduce is_interesting_submodule Stefan Beller
2017-02-15 17:04 ` Brandon Williams
2017-02-15 18:46 ` Stefan Beller
2017-02-15 0:34 ` [PATCH 08/14] update submodules: move up prepare_submodule_repo_env Stefan Beller
2017-02-15 0:34 ` [PATCH 09/14] update submodules: add submodule_go_from_to Stefan Beller
2017-02-15 2:06 ` brian m. carlson
2017-02-15 0:34 ` [PATCH 10/14] unpack-trees: pass old oid to verify_clean_submodule Stefan Beller
2017-02-15 0:34 ` [PATCH 11/14] unpack-trees: check if we can perform the operation for submodules Stefan Beller
2017-02-15 0:34 ` [PATCH 12/14] read-cache: remove_marked_cache_entries to wipe selected submodules Stefan Beller
2017-02-15 0:34 ` [PATCH 13/14] entry.c: update submodules when interesting Stefan Beller
2017-02-15 0:34 ` [PATCH 14/14] builtin/checkout: add --recurse-submodules switch Stefan Beller
2017-02-15 2:08 ` brian m. carlson
2017-02-16 0:33 ` Stefan Beller
2017-02-15 2:13 ` [RFCv3 PATCH 00/14] Checkout aware of Submodules! brian m. carlson
2017-02-15 18:34 ` Junio C Hamano
2017-02-16 0:37 ` [RFCv4 " Stefan Beller
2017-02-16 0:37 ` [PATCH 01/15] lib-submodule-update.sh: reorder create_lib_submodule_repo Stefan Beller
2017-02-16 0:37 ` [PATCH 02/15] lib-submodule-update.sh: do not use ./. as submodule remote Stefan Beller
2017-02-16 0:37 ` [PATCH 03/15] lib-submodule-update.sh: define tests for recursing into submodules Stefan Beller
2017-02-16 20:39 ` Junio C Hamano
2017-02-22 18:43 ` Stefan Beller
2017-02-16 0:38 ` [PATCH 04/15] make is_submodule_populated gently Stefan Beller
2017-02-16 0:38 ` [PATCH 05/15] connect_work_tree_and_git_dir: safely create leading directories Stefan Beller
2017-02-16 20:54 ` Junio C Hamano
2017-02-16 21:16 ` Stefan Beller
2017-02-16 21:25 ` Junio C Hamano
2017-02-16 0:38 ` [PATCH 06/15] update submodules: add submodule config parsing Stefan Beller
2017-02-17 18:24 ` Jacob Keller
2017-02-21 19:42 ` Stefan Beller
2017-02-21 20:48 ` Jacob Keller
2017-02-16 0:38 ` [PATCH 07/15] update submodules: add a config option to determine if submodules are updated Stefan Beller
2017-02-16 0:38 ` [PATCH 08/15] submodules: introduce check to see whether to touch a submodule Stefan Beller
2017-02-16 21:02 ` Junio C Hamano
2017-02-16 22:34 ` Jacob Keller
2017-02-17 18:36 ` Jacob Keller
2017-02-21 20:56 ` Stefan Beller
2017-02-16 0:38 ` [PATCH 09/15] update submodules: move up prepare_submodule_repo_env Stefan Beller
2017-02-16 0:38 ` [PATCH 10/15] update submodules: add submodule_go_from_to Stefan Beller
2017-02-16 21:15 ` Junio C Hamano
2017-02-16 21:33 ` Stefan Beller
2017-02-16 0:38 ` [PATCH 11/15] unpack-trees: pass old oid to verify_clean_submodule Stefan Beller
2017-02-16 21:19 ` Junio C Hamano
2017-02-16 0:38 ` [PATCH 12/15] unpack-trees: check if we can perform the operation for submodules Stefan Beller
2017-02-16 18:01 ` Brandon Williams
2017-02-16 21:23 ` Junio C Hamano
2017-02-17 18:42 ` Jacob Keller
2017-02-21 22:16 ` Stefan Beller
2017-02-21 23:35 ` Jacob Keller
2017-02-21 23:44 ` Stefan Beller
2017-02-22 0:31 ` Jacob Keller
2017-02-16 0:38 ` [PATCH 13/15] read-cache: remove_marked_cache_entries to wipe selected submodules Stefan Beller
2017-02-16 21:32 ` Junio C Hamano
2017-02-16 0:38 ` Stefan Beller [this message]
2017-02-16 0:38 ` [PATCH 15/15] builtin/checkout: add --recurse-submodules switch Stefan Beller
2017-02-16 22:00 ` [RFCv4 PATCH 00/14] Checkout aware of Submodules! Junio C Hamano
2017-02-16 22:54 ` Jacob Keller
2017-02-16 22:56 ` Stefan Beller
2017-02-16 23:27 ` Jacob Keller
2017-02-23 22:57 ` [RFCv5 " Stefan Beller
2017-02-23 22:57 ` [PATCH 01/15] lib-submodule-update.sh: reorder create_lib_submodule_repo Stefan Beller
2017-02-23 22:57 ` [PATCH 02/15] lib-submodule-update.sh: do not use ./. as submodule remote Stefan Beller
2017-02-23 22:57 ` [PATCH 03/15] lib-submodule-update.sh: define tests for recursing into submodules Stefan Beller
2017-02-23 22:57 ` [PATCH 04/15] make is_submodule_populated gently Stefan Beller
2017-02-23 22:57 ` [PATCH 05/15] connect_work_tree_and_git_dir: safely create leading directories Stefan Beller
2017-02-23 22:57 ` [PATCH 06/15] update submodules: add submodule config parsing Stefan Beller
2017-02-23 22:57 ` [PATCH 07/15] update submodules: add a config option to determine if submodules are updated Stefan Beller
2017-02-23 22:57 ` [PATCH 08/15] submodules: introduce check to see whether to touch a submodule Stefan Beller
2017-02-23 22:57 ` [PATCH 09/15] update submodules: move up prepare_submodule_repo_env Stefan Beller
2017-02-23 22:57 ` [PATCH 10/15] update submodules: add submodule_move_head Stefan Beller
2017-02-24 1:21 ` Ramsay Jones
2017-02-24 19:08 ` Stefan Beller
2017-02-23 22:57 ` [PATCH 11/15] unpack-trees: pass old oid to verify_clean_submodule Stefan Beller
2017-02-23 22:57 ` [PATCH 12/15] unpack-trees: check if we can perform the operation for submodules Stefan Beller
2017-02-23 22:57 ` [PATCH 13/15] read-cache, remove_marked_cache_entries: wipe selected submodules Stefan Beller
2017-02-23 22:57 ` [PATCH 14/15] entry.c: update submodules when interesting Stefan Beller
2017-02-23 22:57 ` [PATCH 15/15] builtin/checkout: add --recurse-submodules switch Stefan Beller
2017-02-24 1:25 ` Ramsay Jones
2017-02-24 19: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=20170216003811.18273-15-sbeller@google.com \
--to=sbeller@google.com \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.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).