pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches

diff --git a/submodule.c b/submodule.c
index 461faf0e000ee14cdd0bb3d40121e1d21833e30d..7d70c4f7bfe2749953726fecb27144a9588a326f 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -4,22 +4,25 @@
 #include "diff.h"
 #include "commit.h"
 #include "revision.h"
+#include "run-command.h"
 
-int add_submodule_odb(const char *path)
+static int add_submodule_odb(const char *path)
 {
        struct strbuf objects_directory = STRBUF_INIT;
        struct alternate_object_database *alt_odb;
+       int ret = 0;
 
        strbuf_addf(&objects_directory, "%s/.git/objects/", path);
-       if (!is_directory(objects_directory.buf))
-               return -1;
-
+       if (!is_directory(objects_directory.buf)) {
+               ret = -1;
+               goto done;
+       }
        /* avoid adding it twice */
        for (alt_odb = alt_odb_list; alt_odb; alt_odb = alt_odb->next)
                if (alt_odb->name - alt_odb->base == objects_directory.len &&
                                !strncmp(alt_odb->base, objects_directory.buf,
                                        objects_directory.len))
-                       return 0;
+                       goto done;
 
        alt_odb = xmalloc(objects_directory.len + 42 + sizeof(*alt_odb));
        alt_odb->next = alt_odb_list;
@@ -30,15 +33,18 @@ int add_submodule_odb(const char *path)
        alt_odb->name[41] = '\0';
        alt_odb_list = alt_odb;
        prepare_alt_odb();
-       return 0;
+done:
+       strbuf_release(&objects_directory);
+       return ret;
 }
 
 void show_submodule_summary(FILE *f, const char *path,
                unsigned char one[20], unsigned char two[20],
+               unsigned dirty_submodule,
                const char *del, const char *add, const char *reset)
 {
        struct rev_info rev;
-       struct commit *commit, *left = left, *right;
+       struct commit *commit, *left = left, *right = right;
        struct commit_list *merge_bases, *list;
        const char *message = NULL;
        struct strbuf sb = STRBUF_INIT;
@@ -84,6 +90,8 @@ void show_submodule_summary(FILE *f, const char *path,
        if (!fast_backward && !fast_forward)
                strbuf_addch(&sb, '.');
        strbuf_addf(&sb, "%s", find_unique_abbrev(two, DEFAULT_ABBREV));
+       if (dirty_submodule)
+               strbuf_add(&sb, "-dirty", 6);
        if (message)
                strbuf_addf(&sb, " %s\n", message);
        else
@@ -112,3 +120,54 @@ void show_submodule_summary(FILE *f, const char *path,
        }
        strbuf_release(&sb);
 }
+
+int is_submodule_modified(const char *path)
+{
+       int len;
+       struct child_process cp;
+       const char *argv[] = {
+               "status",
+               "--porcelain",
+               NULL,
+       };
+       char *env[4];
+       struct strbuf buf = STRBUF_INIT;
+
+       strbuf_addf(&buf, "%s/.git/", path);
+       if (!is_directory(buf.buf)) {
+               strbuf_release(&buf);
+               /* The submodule is not checked out, so it is not modified */
+               return 0;
+
+       }
+       strbuf_reset(&buf);
+
+       strbuf_addf(&buf, "GIT_WORK_TREE=%s", path);
+       env[0] = strbuf_detach(&buf, NULL);
+       strbuf_addf(&buf, "GIT_DIR=%s/.git", path);
+       env[1] = strbuf_detach(&buf, NULL);
+       strbuf_addf(&buf, "GIT_INDEX_FILE");
+       env[2] = strbuf_detach(&buf, NULL);
+       env[3] = NULL;
+
+       memset(&cp, 0, sizeof(cp));
+       cp.argv = argv;
+       cp.env = (const char *const *)env;
+       cp.git_cmd = 1;
+       cp.no_stdin = 1;
+       cp.out = -1;
+       if (start_command(&cp))
+               die("Could not run git status --porcelain");
+
+       len = strbuf_read(&buf, cp.out, 1024);
+       close(cp.out);
+
+       if (finish_command(&cp))
+               die("git status --porcelain failed");
+
+       free(env[0]);
+       free(env[1]);
+       free(env[2]);
+       strbuf_release(&buf);
+       return len != 0;
+}