X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=diff-cache.c;h=eb3c2c183a2f786b864b7e867aa54dd2747dddb8;hb=dbbce55b3a1129fcc6c5141dd5b8053512286b83;hp=7e87d28f3a358710b9f11a4b76e4235926f438ee;hpb=211232bae64bcc60bbf5d1b5e5b2344c22ed767e;p=git.git

diff --git a/diff-cache.c b/diff-cache.c
index 7e87d28f..eb3c2c18 100644
--- 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;
 		}
-		changed = cache_match_stat(ce, &st);
+		changed = ce_match_stat(ce, &st);
 		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;
-		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:
@@ -143,7 +143,7 @@ static int diff_cache(struct cache_entry **ac, int entries)
 		do {
 			ac++;
 			entries--;
-		} while (entries && same_name(ce, ac[0]));
+		} while (entries && ce_same_name(ce, ac[0]));
 	}
 	return 0;
 }
@@ -165,7 +165,7 @@ static void mark_merge_entries(void)
 }
 
 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)
 {