projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename some more cache-related functions
[git.git]
/
diff-cache.c
diff --git
a/diff-cache.c
b/diff-cache.c
index
7e87d28
..
eb3c2c1
100644
(file)
--- a/
diff-cache.c
+++ b/
diff-cache.c
@@
-33,7
+33,7
@@
static int get_stat_data(struct cache_entry *ce, unsigned char **sha1p, unsigned
}
return -1;
}
}
return -1;
}
- changed = c
ach
e_match_stat(ce, &st);
+ changed = ce_match_stat(ce, &st);
if (changed) {
mode = create_ce_mode(st.st_mode);
sha1 = no_sha1;
if (changed) {
mode = create_ce_mode(st.st_mode);
sha1 = no_sha1;
@@
-94,7
+94,7
@@
static int diff_cache(struct cache_entry **ac, int entries)
{
while (entries) {
struct cache_entry *ce = *ac;
{
while (entries) {
struct cache_entry *ce = *ac;
- int same = (entries > 1) && same_name(ce, ac[1]);
+ int same = (entries > 1) &&
ce_
same_name(ce, ac[1]);
switch (ce_stage(ce)) {
case 0:
switch (ce_stage(ce)) {
case 0:
@@
-143,7
+143,7
@@
static int diff_cache(struct cache_entry **ac, int entries)
do {
ac++;
entries--;
do {
ac++;
entries--;
- } while (entries && same_name(ce, ac[0]));
+ } while (entries &&
ce_
same_name(ce, ac[0]));
}
return 0;
}
}
return 0;
}
@@
-165,7
+165,7
@@
static void mark_merge_entries(void)
}
static char *diff_cache_usage =
}
static char *diff_cache_usage =
-"
diff-cache [-r] [-z] [-p] [-i
] [--cached] <tree sha1>";
+"
git-diff-cache [-p] [-r] [-z] [-m
] [--cached] <tree sha1>";
int main(int argc, char **argv)
{
int main(int argc, char **argv)
{