mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge fixes up to GIT 1.2.2

Browse Source
This commit is contained in:
Junio C Hamano
2006-02-18 22:55:42 -08:00
parent 711fc8f660 39ba7d5464
commit 709a9e5771
10 changed files with 122 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rev-parse.c
View File

@ -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)