rebase: one safety net, one bugfix and one optimization.

diff --git a/rev-parse.c b/rev-parse.c
index 41b9dae429d2b423f57af4f4e091accfd9697022..bb4949ad70364abdf7c3bbca357e5ebc42880614 100644 (file)
--- a/rev-parse.c
+++ b/rev-parse.c
@@ -34,6 +34,7 @@ static int is_rev_argument(const char *arg)
        static const char *rev_args[] = {
                "--all",
                "--bisect",
+               "--dense",
                "--header",
                "--max-age=",
                "--max-count=",
@@ -44,6 +45,7 @@ static int is_rev_argument(const char *arg)
                "--parents",
                "--pretty",
                "--show-breaks",
+               "--sparse",
                "--topo-order",
                "--unpacked",
                NULL
@@ -129,28 +131,22 @@ static int show_reference(const char *refname, const unsigned char *sha1)
 
 static void show_datestring(const char *flag, const char *datestr)
 {
-       FILE *date;
        static char buffer[100];
-       static char cmd[1000];
-       int len;
 
        /* date handling requires both flags and revs */
        if ((filter & (DO_FLAGS | DO_REVS)) != (DO_FLAGS | DO_REVS))
                return;
-       len = strlen(flag);
-       memcpy(buffer, flag, len);
-
-       snprintf(cmd, sizeof(cmd), "date --date=%s +%%s", sq_quote(datestr));
-       date = popen(cmd, "r");
-       if (!date || !fgets(buffer + len, sizeof(buffer) - len, date))
-               die("git-rev-list: bad date string");
-       pclose(date);
-       len = strlen(buffer);
-       if (buffer[len-1] == '\n')
-               buffer[--len] = 0;
+       snprintf(buffer, sizeof(buffer), "%s%lu", flag, approxidate(datestr));
        show(buffer);
 }
 
+static void show_file(const char *arg)
+{
+       show_default();
+       if ((filter & (DO_NONFLAGS|DO_NOREV)) == (DO_NONFLAGS|DO_NOREV))
+               show(arg);
+}
+
 int main(int argc, char **argv)
 {
        int i, as_is = 0, verify = 0;
@@ -162,12 +158,15 @@ int main(int argc, char **argv)
                char *dotdot;
        
                if (as_is) {
-                       show(arg);
+                       show_file(arg);
                        continue;
                }
                if (*arg == '-') {
                        if (!strcmp(arg, "--")) {
                                as_is = 1;
+                               /* Pass on the "--" if we show anything but files.. */
+                               if (filter & (DO_FLAGS | DO_REVS))
+                                       show_file(arg);
                                continue;
                        }
                        if (!strcmp(arg, "--default")) {
@@ -282,9 +281,8 @@ int main(int argc, char **argv)
                }
                if (verify)
                        die("Needed a single revision");
-               if ((filter & (DO_NONFLAGS|DO_NOREV)) ==
-                   (DO_NONFLAGS|DO_NOREV))
-                       show(arg);
+               as_is = 1;
+               show_file(arg);
        }
        show_default();
        if (verify && revs_count != 1)