mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tree-diff: remove the use of pathspec's raw[] in follow-rename codepath

Browse Source 
Put a checkpoint to guard unsupported pathspec features in future.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2013-07-14 15:36:01 +07:00
committed by Junio C Hamano
parent 84b8b5d1fa
commit 61588ccf78
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tree-diff.c
View File

@ -224,7 +224,7 @@ static void try_to_follow_renames(struct tree_desc *t1, struct tree_desc *t2, co
DIFF_OPT_SET(&diff_opts, RECURSIVE); DIFF_OPT_SET(&diff_opts, RECURSIVE);
DIFF_OPT_SET(&diff_opts, FIND_COPIES_HARDER); DIFF_OPT_SET(&diff_opts, FIND_COPIES_HARDER);
diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT; diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
diff_opts.single_follow = opt->pathspec.raw[0]; diff_opts.single_follow = opt->pathspec.items[0].match;
diff_opts.break_opt = opt->break_opt; diff_opts.break_opt = opt->break_opt;
diff_opts.rename_score = opt->rename_score; diff_opts.rename_score = opt->rename_score;
diff_setup_done(&diff_opts); diff_setup_done(&diff_opts);
@ -243,7 +243,7 @@ static void try_to_follow_renames(struct tree_desc *t1, struct tree_desc *t2, co
* the future! * the future!
*/ */
if ((p->status == 'R' || p->status == 'C') && if ((p->status == 'R' || p->status == 'C') &&
!strcmp(p->two->path, opt->pathspec.raw[0])) { !strcmp(p->two->path, opt->pathspec.items[0].match)) {
const char *path[2]; const char *path[2];
/* Switch the file-pairs around */ /* Switch the file-pairs around */