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: "Junio C Hamano" <gitster@pobox.com>,
	"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH v2 10/46] parse_pathspec: support stripping submodule trailing slashes
Date: Sun, 14 Jul 2013 15:35:33 +0700	[thread overview]
Message-ID: <1373790969-13000-11-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1373790969-13000-1-git-send-email-pclouds@gmail.com>

This flag is equivalent to builtin/ls-files.c:strip_trailing_slashes()
and is intended to replace that function when ls-files is converted to
use parse_pathspec.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 pathspec.c | 9 +++++++++
 pathspec.h | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/pathspec.c b/pathspec.c
index 06778fc..1c07c23 100644
--- a/pathspec.c
+++ b/pathspec.c
@@ -205,6 +205,15 @@ static unsigned prefix_pathspec(struct pathspec_item *item,
 	*raw = item->match = match;
 	item->original = elt;
 	item->len = strlen(item->match);
+
+	if ((flags & PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP) &&
+	    (item->len >= 1 && item->match[item->len - 1] == '/') &&
+	    (i = cache_name_pos(item->match, item->len - 1)) >= 0 &&
+	    S_ISGITLINK(active_cache[i]->ce_mode)) {
+		item->len--;
+		match[item->len] = '\0';
+	}
+
 	if (limit_pathspec_to_literal())
 		item->nowildcard_len = item->len;
 	else
diff --git a/pathspec.h b/pathspec.h
index aa98597..5144851 100644
--- a/pathspec.h
+++ b/pathspec.h
@@ -31,6 +31,8 @@ struct pathspec {
 #define PATHSPEC_PREFER_CWD (1<<0) /* No args means match cwd */
 #define PATHSPEC_PREFER_FULL (1<<1) /* No args means match everything */
 #define PATHSPEC_MAXDEPTH_VALID (1<<2) /* max_depth field is valid */
+/* strip the trailing slash if the given path is a gitlink */
+#define PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP (1<<3)
 
 extern int init_pathspec(struct pathspec *, const char **);
 extern void parse_pathspec(struct pathspec *pathspec,
-- 
1.8.2.83.gc99314b

  parent reply	other threads:[~2013-07-14  8:37 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-14  8:35 [PATCH v2 00/46] "struct pathspec" conversion and :(glob) and :(icase) Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` [PATCH v2 01/46] clean: remove unused variable "seen" Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` [PATCH v2 02/46] Move struct pathspec and related functions to pathspec.[ch] Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` [PATCH v2 03/46] pathspec: i18n-ize error strings in pathspec parsing code Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` [PATCH v2 04/46] pathspec: add copy_pathspec Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` [PATCH v2 05/46] Add parse_pathspec() that converts cmdline args to struct pathspec Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` [PATCH v2 06/46] parse_pathspec: save original pathspec for reporting Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` [PATCH v2 07/46] parse_pathspec: add PATHSPEC_PREFER_{CWD,FULL} Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` [PATCH v2 08/46] Convert some get_pathspec() calls to parse_pathspec() Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` [PATCH v2 09/46] parse_pathspec: add special flag for max_depth feature Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` Nguyễn Thái Ngọc Duy [this message]
2013-07-14  8:35 ` [PATCH v2 11/46] parse_pathspec: support stripping/checking submodule paths Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` [PATCH v2 12/46] parse_pathspec: support prefixing original patterns Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` [PATCH v2 13/46] Guard against new pathspec magic in pathspec matching code Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` [PATCH v2 14/46] clean: convert to use parse_pathspec Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` [PATCH v2 15/46] commit: " Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` [PATCH v2 16/46] status: " Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` [PATCH v2 17/46] rerere: " Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` [PATCH v2 18/46] checkout: " Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` [PATCH v2 19/46] rm: " Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` [PATCH v2 20/46] ls-files: " Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` [PATCH v2 21/46] archive: " Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` [PATCH v2 22/46] check-ignore: " Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` [PATCH v2 23/46] add: " Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` [PATCH v2 24/46] reset: " Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` [PATCH v2 25/46] line-log: " Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` [PATCH v2 26/46] Convert read_cache_preload() to take struct pathspec Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` [PATCH v2 27/46] Convert run_add_interactive to use " Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` [PATCH v2 28/46] Convert unmerge_cache to take " Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` [PATCH v2 29/46] checkout: convert read_tree_some " Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` [PATCH v2 30/46] Convert report_path_error " Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` [PATCH v2 31/46] Convert refresh_index " Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` [PATCH v2 32/46] Convert {read,fill}_directory " Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` [PATCH v2 33/46] Convert add_files_to_cache " Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` [PATCH v2 34/46] Convert common_prefix() to use " Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` [PATCH v2 35/46] Remove diff_tree_{setup,release}_paths Nguyễn Thái Ngọc Duy
2013-07-14  8:35 ` [PATCH v2 36/46] Remove init_pathspec() in favor of parse_pathspec() Nguyễn Thái Ngọc Duy
2013-07-14  8:36 ` [PATCH v2 37/46] Remove match_pathspec() in favor of match_pathspec_depth() Nguyễn Thái Ngọc Duy
2013-07-14  8:36 ` [PATCH v2 38/46] tree-diff: remove the use of pathspec's raw[] in follow-rename codepath Nguyễn Thái Ngọc Duy
2013-07-14  8:36 ` [PATCH v2 39/46] Rename field "raw" to "_raw" in struct pathspec Nguyễn Thái Ngọc Duy
2013-07-14  8:36 ` [PATCH v2 40/46] parse_pathspec: make sure the prefix part is wildcard-free Nguyễn Thái Ngọc Duy
2013-07-14  8:36 ` [PATCH v2 41/46] parse_pathspec: preserve prefix length via PATHSPEC_PREFIX_ORIGIN Nguyễn Thái Ngọc Duy
2013-07-14  8:36 ` [PATCH v2 42/46] Kill limit_pathspec_to_literal() as it's only used by parse_pathspec() Nguyễn Thái Ngọc Duy
2013-07-14  8:36 ` [PATCH v2 43/46] pathspec: support :(literal) syntax for noglob pathspec Nguyễn Thái Ngọc Duy
2013-07-14  8:36 ` [PATCH v2 44/46] pathspec: make --literal-pathspecs disable pathspec magic Nguyễn Thái Ngọc Duy
2013-07-14  8:36 ` [PATCH v2 45/46] pathspec: support :(glob) syntax Nguyễn Thái Ngọc Duy
2013-07-14  8:36 ` [PATCH v2 46/46] parse_pathspec: accept :(icase)path syntax Nguyễn Thái Ngọc Duy
2013-07-14  8:48   ` Eric Sunshine
2013-07-15 19:08 ` [PATCH v2 00/46] "struct pathspec" conversion and :(glob) and :(icase) Junio C Hamano
2013-07-15 21:43 ` Junio C Hamano
2013-08-16 14:07   ` "git fmt-merge-msg" usage (was [PATCH v2 00/46] "struct pathspec" conversion and :(glob) and :(icase)) Michael Haggerty
2013-08-18 19:40     ` "git fmt-merge-msg" usage 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=1373790969-13000-11-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.
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).