describe: omit clearing marks on the last one.

diff --git a/rev-parse.c b/rev-parse.c
index 243f89f3ccd5b96dc517249673d4cfc994ddb888..0c951af0d49da459fc6c85c32707b016bf581a57 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,30 +131,18 @@ 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);
 }
@@ -174,7 +164,6 @@ int main(int argc, char **argv)
                if (*arg == '-') {
                        if (!strcmp(arg, "--")) {
                                as_is = 1;
-                               show_default();
                                /* Pass on the "--" if we show anything but files.. */
                                if (filter & (DO_FLAGS | DO_REVS))
                                        show_file(arg);
@@ -227,6 +216,18 @@ int main(int argc, char **argv)
                                        puts(prefix);
                                continue;
                        }
+                       if (!strcmp(arg, "--show-cdup")) {
+                               const char *pfx = prefix;
+                               while (pfx) {
+                                       pfx = strchr(pfx, '/');
+                                       if (pfx) {
+                                               pfx++;
+                                               printf("../");
+                                       }
+                               }
+                               putchar('\n');
+                               continue;
+                       }
                        if (!strcmp(arg, "--git-dir")) {
                                const char *gitdir = getenv(GIT_DIR_ENVIRONMENT);
                                static char cwd[PATH_MAX];
@@ -292,6 +293,7 @@ int main(int argc, char **argv)
                }
                if (verify)
                        die("Needed a single revision");
+               as_is = 1;
                show_file(arg);
        }
        show_default();