git-rev-parse: split "revs" and "non-revs"

Sometimes we only want to output revisions, and sometimes we want to
only see the stuff that wasn't revisions.  Teach git-rev-parse to
understand the "--revs-only" and "--no-revs" flags.

diff --git a/rev-parse.c b/rev-parse.c
index 69749f5b783bfc35c91b8aa4a98ff7adac3714c1..f4a6cc2c2adc5c4831a5a8d30de65eee846ee708 100644 (file)
--- a/rev-parse.c
+++ b/rev-parse.c
@@ -7,7 +7,7 @@
 
 int main(int argc, char **argv)
 {
 
 int main(int argc, char **argv)
 {

-       int i, as_is = 0;
+       int i, as_is = 0, revs_only = 0, no_revs = 0;

        char *def = NULL;
        unsigned char sha1[20];
 
        char *def = NULL;
        unsigned char sha1[20];
 


@@ -25,6 +25,8 @@ int main(int argc, char **argv)
                                        printf("%s\n", def);
                                        def = NULL;
                                }
                                        printf("%s\n", def);
                                        def = NULL;
                                }

+                               if (revs_only)
+                                       break;

                                as_is = 1;
                        }
                        if (!strcmp(arg, "--default")) {
                                as_is = 1;
                        }
                        if (!strcmp(arg, "--default")) {


@@ -34,15 +36,30 @@ int main(int argc, char **argv)
                                i++;
                                continue;
                        }
                                i++;
                                continue;
                        }

+                       if (!strcmp(arg, "--revs-only")) {
+                               revs_only = 1;
+                               continue;
+                       }
+                       if (!strcmp(arg, "--no-revs")) {
+                               no_revs = 1;
+                               continue;
+                       }
+                       if (revs_only)
+                               continue;

                        printf("%s\n", arg);
                        continue;
                }
                        printf("%s\n", arg);
                        continue;
                }

-               def = NULL;

                if (!get_sha1(arg, sha1)) {
                if (!get_sha1(arg, sha1)) {

+                       if (no_revs)
+                               continue;
+                       def = NULL;

                        printf("%s\n", sha1_to_hex(sha1));
                        continue;
                }
                if (*arg == '^' && !get_sha1(arg+1, sha1)) {
                        printf("%s\n", sha1_to_hex(sha1));
                        continue;
                }
                if (*arg == '^' && !get_sha1(arg+1, sha1)) {

+                       if (no_revs)
+                               continue;
+                       def = NULL;

                        printf("^%s\n", sha1_to_hex(sha1));
                        continue;
                }
                        printf("^%s\n", sha1_to_hex(sha1));
                        continue;
                }


@@ -55,6 +72,9 @@ int main(int argc, char **argv)
                                if (!*n)
                                        n = "HEAD";
                                if (!get_sha1(n, end)) {
                                if (!*n)
                                        n = "HEAD";
                                if (!get_sha1(n, end)) {

+                                       if (no_revs)
+                                               continue;
+                                       def = NULL;

                                        printf("%s\n", sha1_to_hex(end));
                                        printf("^%s\n", sha1_to_hex(sha1));
                                        continue;
                                        printf("%s\n", sha1_to_hex(end));
                                        printf("^%s\n", sha1_to_hex(sha1));
                                        continue;


@@ -62,6 +82,9 @@ int main(int argc, char **argv)
                        }
                        *dotdot = '.';
                }
                        }
                        *dotdot = '.';
                }

+               if (revs_only)
+                       continue;
+               def = NULL;

                printf("%s\n", arg);
        }
        if (def)
                printf("%s\n", arg);
        }
        if (def)