Merge branch 'ja/diff-opt-typofix'

diff --git a/diff.c b/diff.c
index e30a645d9e01ecab1c12d8d14def7de5f6b8d2ed..2068b1c06ed900a703012f5d4afd1bbecd868435 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -25,6 +25,7 @@
 #include "packfile.h"
 #include "parse-options.h"
 #include "help.h"
+#include "fetch-object.h"
 
 #ifdef NO_FAST_WORKING_DIRECTORY
 #define FAST_WORKING_DIRECTORY 0
@@ -5210,9 +5211,11 @@ static int diff_opt_unified(const struct option *opt,
 
        BUG_ON_OPT_NEG(unset);
 
-       options->context = strtol(arg, &s, 10);
-       if (*s)
-               return error(_("%s expects a numerical value"), "--unified");
+       if (arg) {
+               options->context = strtol(arg, &s, 10);
+               if (*s)
+                       return error(_("%s expects a numerical value"), "--unified");
+       }
        enable_patch_output(&options->output_format);
 
        return 0;
@@ -5271,7 +5274,7 @@ static void prep_parse_options(struct diff_options *options)
                          DIFF_FORMAT_PATCH, DIFF_FORMAT_NO_OUTPUT),
                OPT_CALLBACK_F('U', "unified", options, N_("<n>"),
                               N_("generate diffs with <n> lines context"),
-                              PARSE_OPT_NONEG, diff_opt_unified),
+                              PARSE_OPT_NONEG | PARSE_OPT_OPTARG, diff_opt_unified),
                OPT_BOOL('W', "function-context", &options->flags.funccontext,
                         N_("generate diffs with <n> lines context")),
                OPT_BIT_F(0, "raw", &options->output_format,
@@ -5452,13 +5455,13 @@ static void prep_parse_options(struct diff_options *options)
                               N_("equivalent to --word-diff=color --word-diff-regex=<regex>"),
                               PARSE_OPT_NONEG | PARSE_OPT_OPTARG, diff_opt_color_words),
                OPT_CALLBACK_F(0, "color-moved", options, N_("<mode>"),
-                              N_("move lines of code are colored differently"),
+                              N_("moved lines of code are colored differently"),
                               PARSE_OPT_OPTARG, diff_opt_color_moved),
                OPT_CALLBACK_F(0, "color-moved-ws", options, N_("<mode>"),
                               N_("how white spaces are ignored in --color-moved"),
                               0, diff_opt_color_moved_ws),
 
-               OPT_GROUP(N_("Diff other options")),
+               OPT_GROUP(N_("Other diff options")),
                OPT_CALLBACK_F(0, "relative", options, N_("<prefix>"),
                               N_("when run from subdir, exclude changes outside and show relative paths"),
                               PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
@@ -6477,8 +6480,41 @@ void diffcore_fix_diff_index(void)
        QSORT(q->queue, q->nr, diffnamecmp);
 }
 
+static void add_if_missing(struct repository *r,
+                          struct oid_array *to_fetch,
+                          const struct diff_filespec *filespec)
+{
+       if (filespec && filespec->oid_valid &&
+           oid_object_info_extended(r, &filespec->oid, NULL,
+                                    OBJECT_INFO_FOR_PREFETCH))
+               oid_array_append(to_fetch, &filespec->oid);
+}
+
 void diffcore_std(struct diff_options *options)
 {
+       if (options->repo == the_repository &&
+           repository_format_partial_clone) {
+               /*
+                * Prefetch the diff pairs that are about to be flushed.
+                */
+               int i;
+               struct diff_queue_struct *q = &diff_queued_diff;
+               struct oid_array to_fetch = OID_ARRAY_INIT;
+
+               for (i = 0; i < q->nr; i++) {
+                       struct diff_filepair *p = q->queue[i];
+                       add_if_missing(options->repo, &to_fetch, p->one);
+                       add_if_missing(options->repo, &to_fetch, p->two);
+               }
+               if (to_fetch.nr)
+                       /*
+                        * NEEDSWORK: Consider deduplicating the OIDs sent.
+                        */
+                       fetch_objects(repository_format_partial_clone,
+                                     to_fetch.oid, to_fetch.nr);
+               oid_array_clear(&to_fetch);
+       }
+
        /* NOTE please keep the following in sync with diff_tree_combined() */
        if (options->skip_stat_unmatch)
                diffcore_skip_stat_unmatch(options);