t1002: use -U0 instead of --unified=0

diff --git a/rev-parse.c b/rev-parse.c
index a1aa86398a62559b8d04cde2a542edaee7290cf1..4e2d9fbdf6f86e5d2ff28984861d443ca4cdc656 100644 (file)
--- a/rev-parse.c
+++ b/rev-parse.c
@@ -36,23 +36,30 @@ static int is_rev_argument(const char *arg)
                "--all",
                "--bisect",
                "--dense",
+               "--branches",
                "--header",
                "--max-age=",
                "--max-count=",
-               "--merge-order",
                "--min-age=",
                "--no-merges",
                "--objects",
+               "--objects-edge",
                "--parents",
                "--pretty",
-               "--show-breaks",
+               "--remotes",
                "--sparse",
+               "--tags",
                "--topo-order",
+               "--date-order",
                "--unpacked",
                NULL
        };
        const char **p = rev_args;
 
+       /* accept -<digit>, like traditional "head" */
+       if ((*arg == '-') && isdigit(arg[1]))
+               return 1;
+
        for (;;) {
                const char *str = *p++;
                int len;
@@ -103,12 +110,15 @@ static void show_rev(int type, const unsigned char *sha1, const char *name)
 }
 
 /* Output a flag, only if filter allows it. */
-static void show_flag(char *arg)
+static int show_flag(char *arg)
 {
        if (!(filter & DO_FLAGS))
-               return;
-       if (filter & (is_rev_argument(arg) ? DO_REVS : DO_NOREV))
+               return 0;
+       if (filter & (is_rev_argument(arg) ? DO_REVS : DO_NOREV)) {
                show(arg);
+               return 1;
+       }
+       return 0;
 }
 
 static void show_default(void)
@@ -143,11 +153,14 @@ static void show_datestring(const char *flag, const char *datestr)
        show(buffer);
 }
 
-static void show_file(const char *arg)
+static int show_file(const char *arg)
 {
        show_default();
-       if ((filter & (DO_NONFLAGS|DO_NOREV)) == (DO_NONFLAGS|DO_NOREV))
+       if ((filter & (DO_NONFLAGS|DO_NOREV)) == (DO_NONFLAGS|DO_NOREV)) {
                show(arg);
+               return 1;
+       }
+       return 0;
 }
 
 int main(int argc, char **argv)
@@ -155,19 +168,36 @@ int main(int argc, char **argv)
        int i, as_is = 0, verify = 0;
        unsigned char sha1[20];
        const char *prefix = setup_git_directory();
-       
+
+       git_config(git_default_config);
+
        for (i = 1; i < argc; i++) {
-               struct stat st;
                char *arg = argv[i];
                char *dotdot;
-       
+
                if (as_is) {
-                       show_file(arg);
+                       if (show_file(arg) && as_is < 2)
+                               verify_filename(prefix, arg);
+                       continue;
+               }
+               if (!strcmp(arg,"-n")) {
+                       if (++i >= argc)
+                               die("-n requires an argument");
+                       if ((filter & DO_FLAGS) && (filter & DO_REVS)) {
+                               show(arg);
+                               show(argv[i]);
+                       }
+                       continue;
+               }
+               if (!strncmp(arg,"-n",2)) {
+                       if ((filter & DO_FLAGS) && (filter & DO_REVS))
+                               show(arg);
                        continue;
                }
+
                if (*arg == '-') {
                        if (!strcmp(arg, "--")) {
-                               as_is = 1;
+                               as_is = 2;
                                /* Pass on the "--" if we show anything but files.. */
                                if (filter & (DO_FLAGS | DO_REVS))
                                        show_file(arg);
@@ -200,12 +230,12 @@ int main(int argc, char **argv)
                                continue;
                        }
                        if (!strcmp(arg, "--short") ||
-                           !strncmp(arg, "--short=", 9)) {
+                           !strncmp(arg, "--short=", 8)) {
                                filter &= ~(DO_FLAGS|DO_NOREV);
                                verify = 1;
                                abbrev = DEFAULT_ABBREV;
-                               if (arg[8] == '=')
-                                       abbrev = strtoul(arg + 9, NULL, 10);
+                               if (arg[7] == '=')
+                                       abbrev = strtoul(arg + 8, NULL, 10);
                                if (abbrev < MINIMUM_ABBREV)
                                        abbrev = MINIMUM_ABBREV;
                                else if (40 <= abbrev)
@@ -228,6 +258,18 @@ int main(int argc, char **argv)
                                for_each_ref(show_reference);
                                continue;
                        }
+                       if (!strcmp(arg, "--branches")) {
+                               for_each_branch_ref(show_reference);
+                               continue;
+                       }
+                       if (!strcmp(arg, "--tags")) {
+                               for_each_tag_ref(show_reference);
+                               continue;
+                       }
+                       if (!strcmp(arg, "--remotes")) {
+                               for_each_remote_ref(show_reference);
+                               continue;
+                       }
                        if (!strcmp(arg, "--show-prefix")) {
                                if (prefix)
                                        puts(prefix);
@@ -277,9 +319,8 @@ int main(int argc, char **argv)
                                show_datestring("--min-age=", arg+8);
                                continue;
                        }
-                       if (verify)
+                       if (show_flag(arg) && verify)
                                die("Needed a single revision");
-                       show_flag(arg);
                        continue;
                }
 
@@ -287,16 +328,17 @@ int main(int argc, char **argv)
                dotdot = strstr(arg, "..");
                if (dotdot) {
                        unsigned char end[20];
-                       char *n = dotdot+2;
+                       char *next = dotdot + 2;
+                       char *this = arg;
                        *dotdot = 0;
-                       if (!get_sha1(arg, sha1)) {
-                               if (!*n)
-                                       n = "HEAD";
-                               if (!get_sha1(n, end)) {
-                                       show_rev(NORMAL, end, n);
-                                       show_rev(REVERSED, sha1, arg);
-                                       continue;
-                               }
+                       if (!*next)
+                               next = "HEAD";
+                       if (dotdot == arg)
+                               this = "HEAD";
+                       if (!get_sha1(this, sha1) && !get_sha1(next, end)) {
+                               show_rev(NORMAL, end, next);
+                               show_rev(REVERSED, sha1, this);
+                               continue;
                        }
                        *dotdot = '.';
                }
@@ -308,12 +350,12 @@ int main(int argc, char **argv)
                        show_rev(REVERSED, sha1, arg+1);
                        continue;
                }
+               as_is = 1;
+               if (!show_file(arg))
+                       continue;
                if (verify)
                        die("Needed a single revision");
-               if (lstat(arg, &st) < 0)
-                       die("'%s': %s", arg, strerror(errno));
-               as_is = 1;
-               show_file(arg);
+               verify_filename(prefix, arg);
        }
        show_default();
        if (verify && revs_count != 1)