submodule.c: add .gitmodules staging helper functions

Add the new is_staging_gitmodules_ok() and stage_updated_gitmodules()
functions to submodule.c. The first makes it possible for call sites to
see if the .gitmodules file did contain any unstaged modifications they
would accidentally stage in addition to those they intend to stage
themselves. The second function stages all modifications to the
.gitmodules file, both will be used by subsequent patches for the mv
and rm commands.

Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/submodule.c b/submodule.c
index 392e83e0bf00d7546305d46f30ccd7cf511b1886..fb5134a43ba5331c05418a314e25d8f3e0333129 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -10,6 +10,7 @@
 #include "string-list.h"
 #include "sha1-array.h"
 #include "argv-array.h"
 #include "string-list.h"
 #include "sha1-array.h"
 #include "argv-array.h"

+#include "blob.h"

 
 static struct string_list config_name_for_path;
 static struct string_list config_fetch_recurse_submodules_for_name;
 
 static struct string_list config_name_for_path;
 static struct string_list config_fetch_recurse_submodules_for_name;


@@ -30,6 +31,51 @@ static struct sha1_array ref_tips_after_fetch;
  */
 static int gitmodules_is_unmerged;
 
  */
 static int gitmodules_is_unmerged;
 

+/*
+ * This flag is set if the .gitmodules file had unstaged modifications on
+ * startup. This must be checked before allowing modifications to the
+ * .gitmodules file with the intention to stage them later, because when
+ * continuing we would stage the modifications the user didn't stage herself
+ * too. That might change in a future version when we learn to stage the
+ * changes we do ourselves without staging any previous modifications.
+ */
+static int gitmodules_is_modified;
+
+
+int is_staging_gitmodules_ok(void)
+{
+       return !gitmodules_is_modified;
+}
+
+void stage_updated_gitmodules(void)
+{
+       struct strbuf buf = STRBUF_INIT;
+       struct stat st;
+       int pos;
+       struct cache_entry *ce;
+       int namelen = strlen(".gitmodules");
+
+       pos = cache_name_pos(".gitmodules", namelen);
+       if (pos < 0) {
+               warning(_("could not find .gitmodules in index"));
+               return;
+       }
+       ce = active_cache[pos];
+       ce->ce_flags = namelen;
+       if (strbuf_read_file(&buf, ".gitmodules", 0) < 0)
+               die(_("reading updated .gitmodules failed"));
+       if (lstat(".gitmodules", &st) < 0)
+               die_errno(_("unable to stat updated .gitmodules"));
+       fill_stat_cache_info(ce, &st);
+       ce->ce_mode = ce_mode_from_stat(ce, st.st_mode);
+       if (remove_cache_entry_at(pos) < 0)
+               die(_("unable to remove .gitmodules from index"));
+       if (write_sha1_file(buf.buf, buf.len, blob_type, ce->sha1))
+               die(_("adding updated .gitmodules failed"));
+       if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE))
+               die(_("staging updated .gitmodules failed"));
+}
+

 static int add_submodule_odb(const char *path)
 {
        struct strbuf objects_directory = STRBUF_INIT;
 static int add_submodule_odb(const char *path)
 {
        struct strbuf objects_directory = STRBUF_INIT;


@@ -116,6 +162,11 @@ void gitmodules_config(void)
                                    !memcmp(ce->name, ".gitmodules", 11))
                                        gitmodules_is_unmerged = 1;
                        }
                                    !memcmp(ce->name, ".gitmodules", 11))
                                        gitmodules_is_unmerged = 1;
                        }

+               } else if (pos < active_nr) {
+                       struct stat st;
+                       if (lstat(".gitmodules", &st) == 0 &&
+                           ce_match_stat(active_cache[pos], &st, 0) & DATA_CHANGED)
+                               gitmodules_is_modified = 1;

                }
 
                if (!gitmodules_is_unmerged)
                }
 
                if (!gitmodules_is_unmerged)

diff --git a/submodule.h b/submodule.h
index 29e9658980f2aeb6c0bfadbfd8b6d17cfc008f9a..550135456833fcf4cdb2a1c093eb2752585318ba 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -11,6 +11,8 @@ enum {
        RECURSE_SUBMODULES_ON = 2
 };
 
        RECURSE_SUBMODULES_ON = 2
 };
 

+int is_staging_gitmodules_ok(void);
+void stage_updated_gitmodules(void);

 void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
                const char *path);
 int submodule_config(const char *var, const char *value, void *cb);
 void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
                const char *path);
 int submodule_config(const char *var, const char *value, void *cb);