Merge git-mv fixes from 'maint'

diff --git a/rev-parse.c b/rev-parse.c
index b82f294a78994e512c4f30da5bb4ba3eca3f95b4..610eacb35a2ebc5b64b48ae02367543fa2fbb67a 100644 (file)
--- a/rev-parse.c
+++ b/rev-parse.c
@@ -43,11 +43,13 @@ static int is_rev_argument(const char *arg)
                "--min-age=",
                "--no-merges",
                "--objects",
+               "--objects-edge",
                "--parents",
                "--pretty",
                "--show-breaks",
                "--sparse",
                "--topo-order",
+               "--date-order",
                "--unpacked",
                NULL
        };
@@ -225,12 +227,12 @@ int main(int argc, char **argv)
                                continue;
                        }
                        if (!strcmp(arg, "--short") ||
-                           !strncmp(arg, "--short=", 9)) {
+                           !strncmp(arg, "--short=", 8)) {
                                filter &= ~(DO_FLAGS|DO_NOREV);
                                verify = 1;
                                abbrev = DEFAULT_ABBREV;
-                               if (arg[8] == '=')
-                                       abbrev = strtoul(arg + 9, NULL, 10);
+                               if (arg[7] == '=')
+                                       abbrev = strtoul(arg + 8, NULL, 10);
                                if (abbrev < MINIMUM_ABBREV)
                                        abbrev = MINIMUM_ABBREV;
                                else if (40 <= abbrev)