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

Merge branch 'np/types'

Browse Source 
* np/types:
  Cleanup check_valid in commit-tree.
  make sure enum object_type is signed
  get rid of lookup_object_type()
  convert object type handling from a string to a number
  formalize typename(), and add its reverse type_from_string()
  sha1_file.c: don't ignore an error condition in sha1_loose_object_info()
  sha1_file.c: cleanup "offset" usage
  sha1_file.c: cleanup hdr usage
This commit is contained in:
Junio C Hamano
2007-02-28 11:58:27 -08:00
parent fbe3d87e5f 66035a6b3d
commit 597388f6a1
37 changed files with 371 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
diff.c
View File

@ -1436,7 +1436,7 @@ int diff_populate_filespec(struct diff_filespec *s, int size_only)
}
}
else {
char type[20];
enum object_type type;
struct sha1_size_cache *e;
if (size_only) {
@ -1445,11 +1445,12 @@ int diff_populate_filespec(struct diff_filespec *s, int size_only)
s->size = e->size;
return 0;
}
if (!sha1_object_info(s->sha1, type, &s->size))
type = sha1_object_info(s->sha1, &s->size);
if (type < 0)
locate_size_cache(s->sha1, 0, s->size);
}
else {
s->data = read_sha1_file(s->sha1, type, &s->size);
s->data = read_sha1_file(s->sha1, &type, &s->size);
s->should_free = 1;
}
}