X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=rev-parse.c;h=19a5ef7f48a722c44a3534f281581f9a6ed08e84;hb=f4e96f97e85c145616bc2e23e9441bc0daa2906e;hp=9161faed1e916c0a3d53c0df4905a2261e626131;hpb=07e8ab9be913bd50595707f21a896ac15c4f5a89;p=git.git

diff --git a/rev-parse.c b/rev-parse.c
index 9161faed..19a5ef7f 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",
@@ -167,6 +166,8 @@ 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];
@@ -226,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)