Merge git://repo.or.cz/git-gui into pt/git-gui

diff --git a/diff.c b/diff.c
index 9d70f9d731325287dd7e9f83e5e3b44ad1dfb8d9..17873f3d9e88fccbf98e790d243397dcc4ccb24b 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -2627,8 +2627,7 @@ static void fill_metainfo(struct strbuf *msg,
                            (!fill_mmfile(&mf, two) && diff_filespec_is_binary(two)))
                                abbrev = 40;
                }
-               strbuf_addf(msg, "%s%sindex %s..", set,
-                           line_prefix,
+               strbuf_addf(msg, "%s%sindex %s..", line_prefix, set,
                            find_unique_abbrev(one->sha1, abbrev));
                strbuf_addstr(msg, find_unique_abbrev(two->sha1, abbrev));
                if (one->mode == two->mode)
@@ -3168,17 +3167,10 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
        else if (!strcmp(arg, "--no-textconv"))
                DIFF_OPT_CLR(options, ALLOW_TEXTCONV);
        else if (!strcmp(arg, "--ignore-submodules"))
-               DIFF_OPT_SET(options, IGNORE_SUBMODULES);
-       else if (!prefixcmp(arg, "--ignore-submodules=")) {
-               if (!strcmp(arg + 20, "all"))
-                       DIFF_OPT_SET(options, IGNORE_SUBMODULES);
-               else if (!strcmp(arg + 20, "untracked"))
-                       DIFF_OPT_SET(options, IGNORE_UNTRACKED_IN_SUBMODULES);
-               else if (!strcmp(arg + 20, "dirty"))
-                       DIFF_OPT_SET(options, IGNORE_DIRTY_SUBMODULES);
-               else
-                       die("bad --ignore-submodules argument: %s", arg + 20);
-       } else if (!strcmp(arg, "--submodule"))
+               handle_ignore_submodules_arg(options, "all");
+       else if (!prefixcmp(arg, "--ignore-submodules="))
+               handle_ignore_submodules_arg(options, arg + 20);
+       else if (!strcmp(arg, "--submodule"))
                DIFF_OPT_SET(options, SUBMODULE_LOG);
        else if (!prefixcmp(arg, "--submodule=")) {
                if (!strcmp(arg + 12, "log"))