From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH v3 30/31] tree-diff: remove the use of pathspec's raw[] in follow-rename codepath
Date: Sun, 13 Jan 2013 19:35:38 +0700 [thread overview]
Message-ID: <1358080539-17436-31-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1358080539-17436-1-git-send-email-pclouds@gmail.com>
Put a checkpoint to guard unsupported pathspec features in future.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
tree-diff.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tree-diff.c b/tree-diff.c
index aba6df7..718f938 100644
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -225,7 +225,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_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);
@@ -244,7 +244,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') &&
- !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 */
--
1.8.0.rc2.23.g1fb49df
next prev parent reply other threads:[~2013-01-13 12:39 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-13 12:35 [PATCH v3 00/31] nd/parse-pathspec Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 01/31] clean: remove unused variable "seen" Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 02/31] Add copy_pathspec Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 03/31] Add parse_pathspec() that converts cmdline args to struct pathspec Nguyễn Thái Ngọc Duy
2013-01-14 0:05 ` Martin von Zweigbergk
2013-01-14 1:11 ` Duy Nguyen
2013-01-13 12:35 ` [PATCH v3 04/31] parse_pathspec: save original pathspec for reporting Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 05/31] Export parse_pathspec() and convert some get_pathspec() calls Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 06/31] Guard against new pathspec magic in pathspec matching code Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 07/31] clean: convert to use parse_pathspec Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 08/31] parse_pathspec: add PATHSPEC_EMPTY_MATCH_ALL Nguyễn Thái Ngọc Duy
2013-01-21 23:12 ` Martin von Zweigbergk
2013-01-22 2:46 ` Duy Nguyen
2013-01-13 12:35 ` [PATCH v3 09/31] commit: convert to use parse_pathspec Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 10/31] status: " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 11/31] rerere: " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 12/31] checkout: " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 13/31] rm: " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 14/31] parse_pathspec: support stripping submodule trailing slashes Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 15/31] ls-files: convert to use parse_pathspec Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 16/31] archive: " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 17/31] parse_pathspec: support stripping/checking submodule paths Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 18/31] add: convert to use parse_pathspec Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 19/31] Convert read_cache_preload() to take struct pathspec Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 20/31] Convert unmerge_cache " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 21/31] checkout: convert read_tree_some " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 22/31] Convert report_path_error " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 23/31] Convert refresh_index " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 24/31] Convert {read,fill}_directory " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 25/31] Convert add_files_to_cache " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 26/31] Convert common_prefix() to use " Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 27/31] Remove diff_tree_{setup,release}_paths Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 28/31] Remove init_pathspec() in favor of parse_pathspec() Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` [PATCH v3 29/31] Remove match_pathspec() in favor of match_pathspec_depth() Nguyễn Thái Ngọc Duy
2013-01-13 12:35 ` Nguyễn Thái Ngọc Duy [this message]
2013-01-13 12:35 ` [PATCH v3 31/31] Rename field "raw" to "_raw" in struct pathspec Nguyễn Thái Ngọc Duy
2013-01-13 23:21 ` [PATCH v3 00/31] nd/parse-pathspec Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1358080539-17436-31-git-send-email-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).