git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 03/21] pathspec: make sure the prefix part is wildcard-clean
Date: Sun,  6 Jan 2013 13:20:50 +0700	[thread overview]
Message-ID: <1357453268-12543-4-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1357453268-12543-1-git-send-email-pclouds@gmail.com>

Prefix is the result of Git moving back from current directory to
worktree's top directory and it has to prepend all user provided paths
so that they become relative to the new current directory. Any
wildcards in the prefix should not be treated as such because it's not
the user intention. Make sure all wildcards in the prefix part is
disabled.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 setup.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setup.c b/setup.c
index 4fcdae6..573ef79 100644
--- a/setup.c
+++ b/setup.c
@@ -250,6 +250,8 @@ static unsigned prefix_pathspec(struct pathspec_item *item,
 	*raw = item->match;
 	item->len = strlen(item->match);
 	item->nowildcard_len = simple_length(item->match);
+	if (item->nowildcard_len < prefixlen)
+		item->nowildcard_len = prefixlen;
 	return magic;
 }
 
-- 
1.8.0.rc2.23.g1fb49df

  parent reply	other threads:[~2013-01-06  6:21 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-06  6:20 [PATCH 00/21] "struct pathspec" conversion Nguyễn Thái Ngọc Duy
2013-01-06  6:20 ` [PATCH 01/21] pathspec: save the non-wildcard length part Nguyễn Thái Ngọc Duy
2013-01-06  6:20 ` [PATCH 02/21] Add parse_pathspec() that converts cmdline args to struct pathspec Nguyễn Thái Ngọc Duy
2013-01-10 23:26   ` Martin von Zweigbergk
2013-01-11  2:33     ` Duy Nguyen
2013-01-06  6:20 ` Nguyễn Thái Ngọc Duy [this message]
2013-01-07  1:10   ` [PATCH 03/21] pathspec: make sure the prefix part is wildcard-clean Duy Nguyen
2013-01-06  6:20 ` [PATCH 04/21] Export parse_pathspec() and convert some get_pathspec() calls Nguyễn Thái Ngọc Duy
2013-01-06  6:20 ` [PATCH 05/21] clean: convert to use parse_pathspec Nguyễn Thái Ngọc Duy
2013-01-06  6:20 ` [PATCH 06/21] commit: " Nguyễn Thái Ngọc Duy
2013-01-06  6:20 ` [PATCH 07/21] status: " Nguyễn Thái Ngọc Duy
2013-01-06  6:20 ` [PATCH 08/21] rerere: " Nguyễn Thái Ngọc Duy
2013-01-06  6:20 ` [PATCH 09/21] checkout: " Nguyễn Thái Ngọc Duy
2013-01-06  6:20 ` [PATCH 10/21] rm: " Nguyễn Thái Ngọc Duy
2013-01-06  6:20 ` [PATCH 11/21] ls-files: " Nguyễn Thái Ngọc Duy
2013-01-06  6:20 ` [PATCH 12/21] archive: " Nguyễn Thái Ngọc Duy
2013-01-06  6:21 ` [PATCH 13/21] add: " Nguyễn Thái Ngọc Duy
2013-01-06  6:21 ` [PATCH 14/21] Convert read_cache_preload() to take struct pathspec Nguyễn Thái Ngọc Duy
2013-01-06  6:21 ` [PATCH 15/21] Convert unmerge_cache " Nguyễn Thái Ngọc Duy
2013-01-06  6:21 ` [PATCH 16/21] checkout: convert read_tree_some " Nguyễn Thái Ngọc Duy
2013-01-06  6:21 ` [PATCH 17/21] Convert report_path_error " Nguyễn Thái Ngọc Duy
2013-01-06  6:21 ` [PATCH 18/21] Convert refresh_index " Nguyễn Thái Ngọc Duy
2013-01-06  6:21 ` [PATCH 19/21] Convert {read,fill}_directory " Nguyễn Thái Ngọc Duy
2013-01-06  6:21 ` [PATCH 20/21] Convert add_files_to_cache " Nguyễn Thái Ngọc Duy
2013-01-06  6:21 ` [PATCH 21/21] Convert more init_pathspec() to parse_pathspec() Nguyễn Thái Ngọc Duy
2013-01-06 21:45 ` [PATCH 00/21] "struct pathspec" conversion 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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1357453268-12543-4-git-send-email-pclouds@gmail.com \
    --to=pclouds@gmail.com \
    --cc=git@vger.kernel.org \
    /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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).