diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-18 22:55:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-18 22:55:42 -0800 |
| commit | 709a9e5771ddb32995df6a0622e5d643baa4487a (patch) | |
| tree | 2f0a8abd8d61d569b02afd7a6a15df5c7a4be10a /rev-parse.c | |
| parent | 711fc8f660be16ae4c4caaf3caa495d12310b5ad (diff) | |
| parent | 39ba7d54649b35c943b026b54bff40cfa0153f3e (diff) | |
| download | git-709a9e5771ddb32995df6a0622e5d643baa4487a.tar.gz git-709a9e5771ddb32995df6a0622e5d643baa4487a.tar.xz | |
Merge fixes up to GIT 1.2.2
Diffstat (limited to 'rev-parse.c')
| -rw-r--r-- | rev-parse.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rev-parse.c b/rev-parse.c index 9161faed1..a5fb93c3c 100644 --- a/rev-parse.c +++ b/rev-parse.c @@ -226,12 +226,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) |