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

Merge branch 'fix'

Browse Source 
* fix:
  commit-tree.c: check_valid() microoptimization.
  Fix filename verification when in a subdirectory
  rebase: typofix.
  socksetup: don't return on set_reuse_addr() error
This commit is contained in:
Junio C Hamano
2006-04-26 17:08:00 -07:00
parent 3496277a56 5981e09999
commit 69bcc43eca
6 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
commit-tree.c
View File

@ -45,14 +45,13 @@ static void add_buffer(char **bufp, unsigned int *sizep, const char *fmt, ...)
static void check_valid(unsigned char *sha1, const char *expect)
{
void *buf;
char type[20];
unsigned long size;
buf = read_sha1_file(sha1, type, &size);
if (!buf || strcmp(type, expect))
die("%s is not a valid '%s' object", sha1_to_hex(sha1), expect);
free(buf);
if (sha1_object_info(sha1, type, NULL))
die("%s is not a valid object", sha1_to_hex(sha1));
if (expect && strcmp(type, expect))
die("%s is not a valid '%s' object", sha1_to_hex(sha1),
expect);
}
/*