X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=rev-parse.c;h=610eacb35a2ebc5b64b48ae02367543fa2fbb67a;hb=d5dddccaa0c61c67340efca36237dfa06eccef1c;hp=9161faed1e916c0a3d53c0df4905a2261e626131;hpb=62a4417b574ce5120882016fd7803b9bccf68a67;p=git.git diff --git a/rev-parse.c b/rev-parse.c index 9161faed..610eacb3 100644 --- a/rev-parse.c +++ b/rev-parse.c @@ -43,6 +43,7 @@ static int is_rev_argument(const char *arg) "--min-age=", "--no-merges", "--objects", + "--objects-edge", "--parents", "--pretty", "--show-breaks", @@ -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)