Merge branch 'ar/chmod-series' into next

diff --git a/rev-parse.c b/rev-parse.c
index f90e999e607d238fbfe17e84f286570c04844100..e956cd5ed54906335f0b07e9b522a869bfddd218 100644 (file)
--- a/rev-parse.c
+++ b/rev-parse.c
@@ -166,13 +166,17 @@ int main(int argc, char **argv)
        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) {
-                       show_file(arg);
+                       if (show_file(arg) && as_is < 2)
+                               if (lstat(arg, &st) < 0)
+                                       die("'%s': %s", arg, strerror(errno));
                        continue;
                }
                if (!strcmp(arg,"-n")) {
@@ -192,7 +196,7 @@ int main(int argc, char **argv)
 
                if (*arg == '-') {
                        if (!strcmp(arg, "--")) {
-                               as_is = 1;
+                               as_is = 2;
                                /* Pass on the "--" if we show anything but files.. */
                                if (filter & (DO_FLAGS | DO_REVS))
                                        show_file(arg);
@@ -311,16 +315,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 = '.';
                }