mailinfo and git-am: allow "John Doe <johndoe>"

diff --git a/ls-tree.c b/ls-tree.c
index d4b62198a0774409fff4acdbc8b35a7e052f498d..dae377d99585d4e6a176f85f0101d8ae29668f2f 100644 (file)
--- a/ls-tree.c
+++ b/ls-tree.c
@@ -11,47 +11,65 @@
 static int line_termination = '\n';
 #define LS_RECURSIVE 1
 #define LS_TREE_ONLY 2
+#define LS_SHOW_TREES 4
+#define LS_NAME_ONLY 8
 static int ls_options = 0;
 const char **pathspec;
 
 static const char ls_tree_usage[] =
-       "git-ls-tree [-d] [-r] [-z] <tree-ish> [path...]";
+       "git-ls-tree [-d] [-r] [-t] [-z] [--name-only] [--name-status] <tree-ish> [path...]";
+
+static int show_recursive(const char *base, int baselen, const char *pathname)
+{
+       const char **s;
+
+       if (ls_options & LS_RECURSIVE)
+               return 1;
+
+       s = pathspec;
+       if (!s)
+               return 0;
+
+       for (;;) {
+               const char *spec = *s++;
+               int len, speclen;
+
+               if (!spec)
+                       return 0;
+               if (strncmp(base, spec, baselen))
+                       continue;
+               len = strlen(pathname);
+               spec += baselen;
+               speclen = strlen(spec);
+               if (speclen <= len)
+                       continue;
+               if (memcmp(pathname, spec, len))
+                       continue;
+               return 1;
+       }
+}
 
 static int show_tree(unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned mode, int stage)
 {
+       int retval = 0;
        const char *type = "blob";
 
        if (S_ISDIR(mode)) {
-               const char **s;
-               if (ls_options & LS_RECURSIVE)
-                       return READ_TREE_RECURSIVE;
-               s = pathspec;
-               if (s) {
-                       for (;;) {
-                               const char *spec = *s++;
-                               int len, speclen;
-
-                               if (!spec)
-                                       break;
-                               if (strncmp(base, spec, baselen))
-                                       continue;
-                               len = strlen(pathname);
-                               spec += baselen;
-                               speclen = strlen(spec);
-                               if (speclen <= len)
-                                       continue;
-                               if (memcmp(pathname, spec, len))
-                                       continue;
-                               return READ_TREE_RECURSIVE;
-                       }
+               if (show_recursive(base, baselen, pathname)) {
+                       retval = READ_TREE_RECURSIVE;
+                       if (!(ls_options & LS_SHOW_TREES))
+                               return retval;
                }
                type = "tree";
        }
+       else if (ls_options & LS_TREE_ONLY)
+               return 0;
 
-       printf("%06o %s %s\t", mode, type, sha1_to_hex(sha1));
+       if (!(ls_options & LS_NAME_ONLY))
+               printf("%06o %s %s\t", mode, type, sha1_to_hex(sha1));
        write_name_quoted(base, baselen, pathname, line_termination, stdout);
        putchar(line_termination);
-       return 0;
+       return retval;
 }
 
 int main(int argc, const char **argv)
@@ -73,11 +91,25 @@ int main(int argc, const char **argv)
                case 'd':
                        ls_options |= LS_TREE_ONLY;
                        break;
+               case 't':
+                       ls_options |= LS_SHOW_TREES;
+                       break;
+               case '-':
+                       if (!strcmp(argv[1]+2, "name-only") ||
+                           !strcmp(argv[1]+2, "name-status")) {
+                               ls_options |= LS_NAME_ONLY;
+                               break;
+                       }
+                       /* otherwise fallthru */
                default:
                        usage(ls_tree_usage);
                }
                argc--; argv++;
        }
+       /* -d -r should imply -t, but -d by itself should not have to. */
+       if ( (LS_TREE_ONLY|LS_RECURSIVE) ==
+           ((LS_TREE_ONLY|LS_RECURSIVE) & ls_options))
+               ls_options |= LS_SHOW_TREES;
 
        if (argc < 2)
                usage(ls_tree_usage);