Avoid gcc warning in diff-stages.c

diff --git a/rev-parse.c b/rev-parse.c
index 69749f5b783bfc35c91b8aa4a98ff7adac3714c1..fd5f2ddca36ea45cd9feaf706a53aa66956db233 100644 (file)
--- a/rev-parse.c
+++ b/rev-parse.c
@@ -5,9 +5,36 @@
  */
 #include "cache.h"
 
+/*
+ * Some arguments are relevant "revision" arguments,
+ * others are about output format or other details.
+ * This sorts it all out.
+ */
+static int is_rev_argument(const char *arg)
+{
+       static const char *rev_args[] = {
+               "--max-count=",
+               "--max-age=",
+               "--min-age=",
+               "--merge-order",
+               NULL
+       };
+       const char **p = rev_args;
+
+       for (;;) {
+               const char *str = *p++;
+               int len;
+               if (!str)
+                       return 0;
+               len = strlen(str);
+               if (!strncmp(arg, str, len))
+                       return 1;
+       }
+}
+
 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];
 
@@ -25,6 +52,8 @@ int main(int argc, char **argv)
                                        printf("%s\n", def);
                                        def = NULL;
                                }
+                               if (revs_only)
+                                       break;
                                as_is = 1;
                        }
                        if (!strcmp(arg, "--default")) {
@@ -34,15 +63,32 @@ int main(int argc, char **argv)
                                i++;
                                continue;
                        }
+                       if (!strcmp(arg, "--revs-only")) {
+                               revs_only = 1;
+                               continue;
+                       }
+                       if (!strcmp(arg, "--no-revs")) {
+                               no_revs = 1;
+                               continue;
+                       }
+                       if (revs_only | no_revs) {
+                               if (is_rev_argument(arg) != revs_only)
+                                       continue;
+                       }
                        printf("%s\n", arg);
                        continue;
                }
-               def = NULL;
                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)) {
+                       if (no_revs)
+                               continue;
+                       def = NULL;
                        printf("^%s\n", sha1_to_hex(sha1));
                        continue;
                }
@@ -55,6 +101,9 @@ int main(int argc, char **argv)
                                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;
@@ -62,6 +111,9 @@ int main(int argc, char **argv)
                        }
                        *dotdot = '.';
                }
+               if (revs_only)
+                       continue;
+               def = NULL;
                printf("%s\n", arg);
        }
        if (def)