X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=rev-parse.c;h=f90e999e607d238fbfe17e84f286570c04844100;hb=a5370b16c34993c1d0f65171d5704244901e005b;hp=9161faed1e916c0a3d53c0df4905a2261e626131;hpb=4c8725f16abff4be4812d0d07a663250bef3ef0e;p=git.git

diff --git a/rev-parse.c b/rev-parse.c
index 9161faed..f90e999e 100644
--- a/rev-parse.c
+++ b/rev-parse.c
@@ -39,13 +39,12 @@ static int is_rev_argument(const char *arg)
 		"--header",
 		"--max-age=",
 		"--max-count=",
-		"--merge-order",
 		"--min-age=",
 		"--no-merges",
 		"--objects",
+		"--objects-edge",
 		"--parents",
 		"--pretty",
-		"--show-breaks",
 		"--sparse",
 		"--topo-order",
 		"--date-order",
@@ -226,12 +225,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)