rebase: replace antiquated sed invocation

diff --git a/submodule.c b/submodule.c
index d5fce7a882e14f6154d56f38531ba5d9000dabda..f657bee379a6bc0fc7d6bd263c32e1b7e3e61efc 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -4,8 +4,9 @@
 #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;
@@ -38,7 +39,7 @@ void show_submodule_summary(FILE *f, const char *path,
                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;
@@ -92,6 +93,8 @@ void show_submodule_summary(FILE *f, const char *path,
 
        if (!message) {
                while ((commit = get_revision(&rev))) {
+                       struct pretty_print_context ctx = {0};
+                       ctx.date_mode = rev.date_mode;
                        strbuf_setlen(&sb, 0);
                        if (commit->object.flags & SYMMETRIC_LEFT) {
                                if (del)
@@ -99,8 +102,7 @@ void show_submodule_summary(FILE *f, const char *path,
                        }
                        else if (add)
                                strbuf_addstr(&sb, add);
-                       format_commit_message(commit, format, &sb,
-                                       rev.date_mode);
+                       format_commit_message(commit, format, &sb, &ctx);
                        if (reset)
                                strbuf_addstr(&sb, reset);
                        strbuf_addch(&sb, '\n');
@@ -111,3 +113,51 @@ 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[3];
+       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);
+       env[2] = 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]);
+       strbuf_release(&buf);
+       return len != 0;
+}