summaryrefslogtreecommitdiff
path: root/builtin/diff.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2010-12-15 15:02:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-02-03 20:28:15 (GMT)
commit66f136252fe1998e2c1381c913795b5f56b6dc8c (patch)
tree60cc0586003999c1c3d74c0ab2847a20decff6df /builtin/diff.c
parent16dc36fea87e917a7f734400eb91e62e170db1a8 (diff)
downloadgit-66f136252fe1998e2c1381c913795b5f56b6dc8c.zip
git-66f136252fe1998e2c1381c913795b5f56b6dc8c.tar.gz
git-66f136252fe1998e2c1381c913795b5f56b6dc8c.tar.bz2
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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/diff.c b/builtin/diff.c
index 945e758..a08c324 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;
}