Subject: [PATCH 11/17] pathspec retrieval fix

From: Nguyễn Thái Ngọc Duy <[email-masked]>
Date: Sun, 5 Sep 2010 16:47:38 +1000

In normal repos, when there is no command line argument, it's safe to
say we don't have pathspec. In narrow repos, get_pathspec() in that
case will still generate some pathspecs (the narrow prefix). Make sure
get_pathspec() is always called.

Some commands however, especially plumbings, won't want narrow prefix
to get in the way. Use get_pathspec_narrow(...., 0); in those cases to
disable narrow pathspec rewriting.

Signed-off-by: Nguyễn Thái Ngọc Duy <[email-masked]>
---
 builtin/commit.c   |    6 ++----
 builtin/grep.c     |    5 ++---
 builtin/ls-files.c |    2 +-
 builtin/ls-tree.c  |    2 +-
 builtin/reset.c    |    3 +--
 revision.c         |    5 +++++
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/builtin/commit.c b/builtin/commit.c
index 66fdd22..d8c5273 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -303,8 +303,7 @@ static char *prepare_index(int argc, const char **argv, const char *prefix, int
 		return get_index_file();
 	}
 
-	if (*argv)
-		pathspec = get_pathspec(prefix, argv);
+	pathspec = get_pathspec(prefix, argv);
 
 	if (read_cache_preload(pathspec) < 0)
 		die("index file corrupt");
@@ -1083,8 +1082,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)
 	handle_untracked_files_arg(&s);
 	if (show_ignored_in_status)
 		s.show_ignored_files = 1;
-	if (*argv)
-		s.pathspec = get_pathspec(prefix, argv);
+	s.pathspec = get_pathspec(prefix, argv);
 
 	read_cache_preload(s.pathspec);
 	refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, s.pathspec, NULL, NULL);
diff --git a/builtin/grep.c b/builtin/grep.c
index cf6c29f..b55a0a4 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -1058,9 +1058,8 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 			verify_filename(prefix, argv[j]);
 	}
 
-	if (i < argc)
-		paths = get_pathspec(prefix, argv + i);
-	else if (prefix) {
+	paths = get_pathspec(prefix, argv + i);
+	if (prefix && !paths) {
 		paths = xcalloc(2, sizeof(const char *));
 		paths[0] = prefix;
 		paths[1] = NULL;
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index bb4f612..27610ab 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -565,7 +565,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
 	if (require_work_tree && !is_inside_work_tree())
 		setup_work_tree();
 
-	pathspec = get_pathspec(prefix, argv);
+	pathspec = get_pathspec_narrow(prefix, argv, 0);
 
 	/* be nice with submodule paths ending in a slash */
 	if (pathspec)
diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
index dc86b0d..d37eaa5 100644
--- a/builtin/ls-tree.c
+++ b/builtin/ls-tree.c
@@ -164,7 +164,7 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix)
 	if (get_sha1(argv[0], sha1))
 		die("Not a valid object name %s", argv[0]);
 
-	pathspec = get_pathspec(prefix, argv + 1);
+	pathspec = get_pathspec_narrow(prefix, argv + 1, 0);
 	tree = parse_tree_indirect(sha1);
 	if (!tree)
 		die("not a tree object");
diff --git a/builtin/reset.c b/builtin/reset.c
index 1283068..ae96c8b 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -181,8 +181,7 @@ static int interactive_reset(const char *revision, const char **argv,
 {
 	const char **pathspec = NULL;
 
-	if (*argv)
-		pathspec = get_pathspec(prefix, argv);
+	pathspec = get_pathspec(prefix, argv);
 
 	return run_add_interactive(revision, "--patch=reset", pathspec);
 }
diff --git a/revision.c b/revision.c
index ea64970..73fe894 100644
--- a/revision.c
+++ b/revision.c
@@ -1625,6 +1625,11 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
 
 	if (prune_data)
 		revs->prune_data = get_pathspec(revs->prefix, prune_data);
+	else if (get_narrow_prefix()) {
+		const char *nul = NULL;
+		prune_data = &nul;
+		revs->prune_data = get_pathspec(revs->prefix, prune_data);
+	}
 
 	if (revs->def == NULL)
 		revs->def = opt ? opt->def : NULL;
-- 
1.7.1.rc1.69.g24c2f7