Merge branch 'jc/quote-path-cleanup'

[thirdparty/git.git] / diff.c

diff --git a/diff.c b/diff.c
index 0299a730795185db71341f5d7b277205604cac59..ee8e8189e934b322ae53fc227859d1f74e30b6e3 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -482,14 +482,14 @@ int git_diff_basic_config(const char *var, const char *value, void *cb)
 
 static char *quote_two(const char *one, const char *two)
 {
-       int need_one = quote_c_style(one, NULL, NULL, 1);
-       int need_two = quote_c_style(two, NULL, NULL, 1);
+       int need_one = quote_c_style(one, NULL, NULL, CQUOTE_NODQ);
+       int need_two = quote_c_style(two, NULL, NULL, CQUOTE_NODQ);
        struct strbuf res = STRBUF_INIT;
 
        if (need_one + need_two) {
                strbuf_addch(&res, '"');
-               quote_c_style(one, &res, NULL, 1);
-               quote_c_style(two, &res, NULL, 1);
+               quote_c_style(one, &res, NULL, CQUOTE_NODQ);
+               quote_c_style(two, &res, NULL, CQUOTE_NODQ);
                strbuf_addch(&res, '"');
        } else {
                strbuf_addstr(&res, one);
@@ -3432,7 +3432,7 @@ static void builtin_diff(const char *name_a,
        if (o->submodule_format == DIFF_SUBMODULE_LOG &&
            (!one->mode || S_ISGITLINK(one->mode)) &&
            (!two->mode || S_ISGITLINK(two->mode))) {
-               show_submodule_summary(o, one->path ? one->path : two->path,
+               show_submodule_diff_summary(o, one->path ? one->path : two->path,
                                &one->oid, &two->oid,
                                two->dirty_submodule);
                return;