diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-12-15 22:02:38 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-02-03 12:28:15 -0800 |
| commit | 66f136252fe1998e2c1381c913795b5f56b6dc8c (patch) | |
| tree | 60cc0586003999c1c3d74c0ab2847a20decff6df /builtin/diff.c | |
| parent | diff-no-index: use diff_tree_setup_paths() (diff) | |
| download | tgif-66f136252fe1998e2c1381c913795b5f56b6dc8c.tar.xz | |
Convert struct diff_options to use struct pathspec
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/diff.c')
| -rw-r--r-- | builtin/diff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/diff.c b/builtin/diff.c index 945e7583a8..a08c3240d5 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -135,7 +135,7 @@ static int builtin_diff_index(struct rev_info *revs, revs->max_count != -1 || revs->min_age != -1 || revs->max_age != -1) usage(builtin_diff_usage); - if (read_cache_preload(revs->diffopt.paths) < 0) { + if (read_cache_preload(revs->diffopt.pathspec.raw) < 0) { perror("read_cache_preload"); return -1; } @@ -237,7 +237,7 @@ static int builtin_diff_files(struct rev_info *revs, int argc, const char **argv revs->combine_merges = revs->dense_combined_merges = 1; setup_work_tree(); - if (read_cache_preload(revs->diffopt.paths) < 0) { + if (read_cache_preload(revs->diffopt.pathspec.raw) < 0) { perror("read_cache_preload"); return -1; } |