Fix up some fallout from "setup_git_directory()" cleanups
git-ls-files was broken by the setup_git_directory() calling changes, because I had missed the fact that the "prefix" variable in that file was static to the whole file, and unlike git-ls-tree (where I had fixed it up), it ended up using two different variables with the same name depending on what the scoping happened to be. This fixes it up properly (by just removing the static variable, and passing the automatic one around properly), and git-ls-files should work again. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds committed
Jul 31, 2006 at 13:13 UTC
3e04228b0c4bbb4b5cd46db9a714dfe699fa4cb8
1 file changed
+7
-8
builtin-ls-files.c
+7
-8
@@ -24,7 +24,6 @@ static int show_valid_bit = 0;
24
static int line_terminator = '\n';
25
26
static int prefix_len = 0, prefix_offset = 0;
27
-static const char *prefix = NULL;
27
static const char **pathspec = NULL;
28
static int error_unmatch = 0;
29
static char *ps_matched = NULL;
@@ -207,7 +206,7 @@ static void show_ce_entry(const char *tag, struct cache_entry *ce)
206
}
207
}
208
210
-static void show_files(struct dir_struct *dir)
209
+static void show_files(struct dir_struct *dir, const char *prefix)
210
{
211
int i;
212
@@ -253,7 +252,7 @@ static void show_files(struct dir_struct *dir)
252
/*
253
* Prune the index to only contain stuff starting with "prefix"
254
*/
256
-static void prune_cache(void)
255
+static void prune_cache(const char *prefix)
256
{
257
int pos = cache_name_pos(prefix, prefix_len);
258
unsigned int first, last;
@@ -276,7 +275,7 @@ static void prune_cache(void)
275
active_nr = last;
276
}
277
279
-static void verify_pathspec(void)
278
+static const char *verify_pathspec(const char *prefix)
279
{
280
const char **p, *n, *prev;
281
char *real_prefix;
@@ -313,7 +312,7 @@ static void verify_pathspec(void)
312
memcpy(real_prefix, prev, max);
313
real_prefix[max] = 0;
314
}
316
- prefix = real_prefix;
315
+ return real_prefix;
316
}
317
318
static const char ls_files_usage[] =
@@ -453,7 +452,7 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix)
452
453
/* Verify that the pathspec matches the prefix */
454
if (pathspec)
456
- verify_pathspec();
455
+ prefix = verify_pathspec(prefix);
456
457
/* Treat unmatching pathspec elements as errors */
458
if (pathspec && error_unmatch) {
@@ -476,8 +475,8 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix)
475
476
read_cache();
477
if (prefix)
479
- prune_cache();
480
- show_files(&dir);
478
+ prune_cache(prefix);
479
+ show_files(&dir, prefix);
480
481
if (ps_matched) {
482
/* We need to make sure all pathspec matched otherwise