projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
apply --cached: apply a patch without using working tree.
[git.git]
/
read-cache.c
diff --git
a/read-cache.c
b/read-cache.c
index
efbb1be
..
a917ab0
100644
(file)
--- a/
read-cache.c
+++ b/
read-cache.c
@@
-246,9
+246,9
@@
int cache_name_compare(const char *name1, int flags1, const char *name2, int fla
if (len1 > len2)
return 1;
if (len1 > len2)
return 1;
- /*
Differences between "assume up-to-date" should not matter.
*/
- flags1 &=
~CE_VALID
;
- flags2 &=
~CE_VALID
;
+ /*
Compare stages
*/
+ flags1 &=
CE_STAGEMASK
;
+ flags2 &=
CE_STAGEMASK
;
if (flags1 < flags2)
return -1;
if (flags1 < flags2)
return -1;
@@
-552,7
+552,7
@@
int read_cache(void)
active_nr = ntohl(hdr->hdr_entries);
active_alloc = alloc_nr(active_nr);
active_nr = ntohl(hdr->hdr_entries);
active_alloc = alloc_nr(active_nr);
- active_cache = calloc(active_alloc, sizeof(struct cache_entry *));
+ active_cache =
x
calloc(active_alloc, sizeof(struct cache_entry *));
offset = sizeof(*hdr);
for (i = 0; i < active_nr; i++) {
offset = sizeof(*hdr);
for (i = 0; i < active_nr; i++) {