Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
tree-diff: remove the use of pathspec's raw[] in follow-rename codepath
author
Nguyễn Thái Ngọc Duy
<pclouds@gmail.com>
Sun, 14 Jul 2013 08:36:01 +0000
(15:36 +0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 15 Jul 2013 17:56:09 +0000
(10:56 -0700)
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>
tree-diff.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (from parent 1:
84b8b5d
)
diff --git
a/tree-diff.c
b/tree-diff.c
index e1145c60e7a82e2c6422494603fbb4e01f865cf4..21a50d8ed3bc6fcfd92e4e00a23a80a20f869f9f 100644
(file)
--- a/
tree-diff.c
+++ b/
tree-diff.c
@@
-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, FIND_COPIES_HARDER);
diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
DIFF_OPT_SET(&diff_opts, RECURSIVE);
DIFF_OPT_SET(&diff_opts, FIND_COPIES_HARDER);
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.rename_score = opt->rename_score;
diff_setup_done(&diff_opts);
diff_opts.break_opt = opt->break_opt;
diff_opts.rename_score = opt->rename_score;
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!
*/
if ((p->status == 'R' || p->status == 'C') &&
* the future!
*/
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];
/* Switch the file-pairs around */
const char *path[2];
/* Switch the file-pairs around */