l10n: vi.po (2210t): Updated git-core translation

diff --git a/combine-diff.c b/combine-diff.c
index 3d2aaf34ab53accccf1c3877557522ea012be42d..3b92c44880228a94f71a428b0f11bb1caf693c67 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -166,7 +166,7 @@ static struct lline *coalesce_lines(struct lline *base, int *lenbase,
 
        /*
         * Coalesce new lines into base by finding the LCS
-        * - Create the table to run dynamic programing
+        * - Create the table to run dynamic programming
         * - Compute the LCS
         * - Then reverse read the direction structure:
         *   - If we have MATCH, assign parent to base flag, and consume
@@ -1306,7 +1306,7 @@ void diff_tree_combined(const unsigned char *sha1,
        int i, num_paths, needsep, show_log_first, num_parent = parents->nr;
 
        diffopts = *opt;
-       diff_tree_setup_paths(diffopts.pathspec.raw, &diffopts);
+       copy_pathspec(&diffopts.pathspec, &opt->pathspec);
        diffopts.output_format = DIFF_FORMAT_NO_OUTPUT;
        DIFF_OPT_SET(&diffopts, RECURSIVE);
        DIFF_OPT_CLR(&diffopts, ALLOW_EXTERNAL);
@@ -1378,7 +1378,7 @@ void diff_tree_combined(const unsigned char *sha1,
                free(tmp);
        }
 
-       diff_tree_release_paths(&diffopts);
+       free_pathspec(&diffopts.pathspec);
 }
 
 void diff_tree_combined_merge(const struct commit *commit, int dense,