format-patch: resurrect extra headers from config

[git.git] / rev-parse.c

diff --git a/rev-parse.c b/rev-parse.c
index f176c56..4e2d9fb 100644 (file)
--- a/rev-parse.c
+++ b/rev-parse.c
@@ -36,6 +36,7 @@ static int is_rev_argument(const char *arg)
                "--all",
                "--bisect",
                "--dense",
+               "--branches",
                "--header",
                "--max-age=",
                "--max-count=",
@@ -45,7 +46,9 @@ static int is_rev_argument(const char *arg)
                "--objects-edge",
                "--parents",
                "--pretty",
+               "--remotes",
                "--sparse",
+               "--tags",
                "--topo-order",
                "--date-order",
                "--unpacked",
@@ -165,18 +168,16 @@ 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) {
                        if (show_file(arg) && as_is < 2)
-                               if (lstat(arg, &st) < 0)
-                                       die("'%s': %s", arg, strerror(errno));
+                               verify_filename(prefix, arg);
                        continue;
                }
                if (!strcmp(arg,"-n")) {
@@ -257,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);
@@ -315,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 = '.';
                }
@@ -341,8 +355,7 @@ int main(int argc, char **argv)
                        continue;
                if (verify)
                        die("Needed a single revision");
-               if (lstat(arg, &st) < 0)
-                       die("'%s': %s", arg, strerror(errno));
+               verify_filename(prefix, arg);
        }
        show_default();
        if (verify && revs_count != 1)