diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-12-15 15:02:37 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-03 20:19:19 (GMT) |
| commit | 16dc36fea87e917a7f734400eb91e62e170db1a8 (patch) | |
| tree | 03a515e89aa6f000d65b0b9f8a3d66af6c05c7a3 | |
| parent | 0602f3e916a2727dfc4954b81ce5aacd69d9692c (diff) | |
| download | git-16dc36fea87e917a7f734400eb91e62e170db1a8.zip git-16dc36fea87e917a7f734400eb91e62e170db1a8.tar.gz git-16dc36fea87e917a7f734400eb91e62e170db1a8.tar.bz2 | |
diff-no-index: use diff_tree_setup_paths()
diff_options.{paths,nr_paths} will be removed later. Do not
modify them directly.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | diff-no-index.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/diff-no-index.c b/diff-no-index.c index ce9e783..e48ab92 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -231,8 +231,9 @@ void diff_no_index(struct rev_info *revs, if (prefix) { int len = strlen(prefix); + const char *paths[3]; + memset(paths, 0, sizeof(paths)); - revs->diffopt.paths = xcalloc(2, sizeof(char *)); for (i = 0; i < 2; i++) { const char *p = argv[argc - 2 + i]; /* @@ -242,12 +243,12 @@ void diff_no_index(struct rev_info *revs, p = (strcmp(p, "-") ? xstrdup(prefix_filename(prefix, len, p)) : p); - revs->diffopt.paths[i] = p; + paths[i] = p; } + diff_tree_setup_paths(paths, &revs->diffopt); } else - revs->diffopt.paths = argv + argc - 2; - revs->diffopt.nr_paths = 2; + diff_tree_setup_paths(argv + argc - 2, &revs->diffopt); revs->diffopt.skip_stat_unmatch = 1; if (!revs->diffopt.output_format) revs->diffopt.output_format = DIFF_FORMAT_PATCH; |