projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix wrong filename listing bug in git-ls-tree.
[git.git]
/
ls-files.c
diff --git
a/ls-files.c
b/ls-files.c
index
56f3919
..
f47114a
100644
(file)
--- a/
ls-files.c
+++ b/
ls-files.c
@@
-16,6
+16,7
@@
static int show_others = 0;
static int show_ignored = 0;
static int show_stage = 0;
static int show_unmerged = 0;
static int show_ignored = 0;
static int show_stage = 0;
static int show_unmerged = 0;
+static int show_modified = 0;
static int show_killed = 0;
static int line_terminator = '\n';
static int show_killed = 0;
static int line_terminator = '\n';
@@
-28,8
+29,9
@@
static const char *tag_unmerged = "";
static const char *tag_removed = "";
static const char *tag_other = "";
static const char *tag_killed = "";
static const char *tag_removed = "";
static const char *tag_other = "";
static const char *tag_killed = "";
+static const char *tag_modified = "";
-static char *exclude_per_dir = NULL;
+static c
onst c
har *exclude_per_dir = NULL;
/* We maintain three exclude pattern lists:
* EXC_CMDL lists patterns explicitly given on the command line.
/* We maintain three exclude pattern lists:
* EXC_CMDL lists patterns explicitly given on the command line.
@@
-205,7
+207,7
@@
static int excluded(const char *pathname)
struct nond_on_fs {
int len;
struct nond_on_fs {
int len;
- char name[];
+ char name[
0
];
};
static struct nond_on_fs **dir;
};
static struct nond_on_fs **dir;
@@
-443,15
+445,18
@@
static void show_files(void)
show_ce_entry(ce_stage(ce) ? tag_unmerged : tag_cached, ce);
}
}
show_ce_entry(ce_stage(ce) ? tag_unmerged : tag_cached, ce);
}
}
- if (show_deleted) {
+ if (show_deleted
| show_modified
) {
for (i = 0; i < active_nr; i++) {
struct cache_entry *ce = active_cache[i];
struct stat st;
for (i = 0; i < active_nr; i++) {
struct cache_entry *ce = active_cache[i];
struct stat st;
+ int err;
if (excluded(ce->name) != show_ignored)
continue;
if (excluded(ce->name) != show_ignored)
continue;
- if (!lstat(ce->name, &st))
- continue;
- show_ce_entry(tag_removed, ce);
+ err = lstat(ce->name, &st);
+ if (show_deleted && err)
+ show_ce_entry(tag_removed, ce);
+ if (show_modified && ce_modified(ce, &st))
+ show_ce_entry(tag_modified, ce);
}
}
}
}
}
}
@@
-496,7
+501,7
@@
static void verify_pathspec(void)
char c = n[i];
if (prev && prev[i] != c)
break;
char c = n[i];
if (prev && prev[i] != c)
break;
- if (c == '*' || c == '?')
+ if (
!c ||
c == '*' || c == '?')
break;
if (c == '/')
len = i+1;
break;
if (c == '/')
len = i+1;
@@
-523,11
+528,11
@@
static void verify_pathspec(void)
}
static const char ls_files_usage[] =
}
static const char ls_files_usage[] =
- "git-ls-files [-z] [-t] (--[cached|deleted|others|stage|unmerged|killed])* "
+ "git-ls-files [-z] [-t] (--[cached|deleted|others|stage|unmerged|killed
|modified
])* "
"[ --ignored ] [--exclude=<pattern>] [--exclude-from=<file>] "
"[ --ignored ] [--exclude=<pattern>] [--exclude-from=<file>] "
- "[ --exclude-per-directory=<filename> ]";
+ "[ --exclude-per-directory=<filename> ]
[--] [<file>]*
";
-int main(int argc, char **argv)
+int main(int argc, c
onst c
har **argv)
{
int i;
int exc_given = 0;
{
int i;
int exc_given = 0;
@@
-537,8
+542,12
@@
int main(int argc, char **argv)
prefix_offset = strlen(prefix);
for (i = 1; i < argc; i++) {
prefix_offset = strlen(prefix);
for (i = 1; i < argc; i++) {
- char *arg = argv[i];
+ c
onst c
har *arg = argv[i];
+ if (!strcmp(arg, "--")) {
+ i++;
+ break;
+ }
if (!strcmp(arg, "-z")) {
line_terminator = 0;
continue;
if (!strcmp(arg, "-z")) {
line_terminator = 0;
continue;
@@
-547,6
+556,7
@@
int main(int argc, char **argv)
tag_cached = "H ";
tag_unmerged = "M ";
tag_removed = "R ";
tag_cached = "H ";
tag_unmerged = "M ";
tag_removed = "R ";
+ tag_modified = "C ";
tag_other = "? ";
tag_killed = "K ";
continue;
tag_other = "? ";
tag_killed = "K ";
continue;
@@
-559,6
+569,10
@@
int main(int argc, char **argv)
show_deleted = 1;
continue;
}
show_deleted = 1;
continue;
}
+ if (!strcmp(arg, "-m") || !strcmp(arg, "--modified")) {
+ show_modified = 1;
+ continue;
+ }
if (!strcmp(arg, "-o") || !strcmp(arg, "--others")) {
show_others = 1;
continue;
if (!strcmp(arg, "-o") || !strcmp(arg, "--others")) {
show_others = 1;
continue;
@@
-630,7
+644,8
@@
int main(int argc, char **argv)
}
/* With no flags, we default to showing the cached files */
}
/* With no flags, we default to showing the cached files */
- if (!(show_stage | show_deleted | show_others | show_unmerged | show_killed))
+ if (!(show_stage | show_deleted | show_others | show_unmerged |
+ show_killed | show_modified))
show_cached = 1;
read_cache();
show_cached = 1;
read_cache();