X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=show-diff.c;h=a15e9b4cf0be5f67373d08fb5c833dd5c1d3eeb8;hb=ccc4feb579265266d0a4a73c0c9443ecc0c26ce3;hp=bc3791aaaab22f345bcf2478fdced16cd5e1bdce;hpb=e2e5e98a40d6ed04b7acf791cc2243ff32923db3;p=git.git diff --git a/show-diff.c b/show-diff.c index bc3791aa..a15e9b4c 100644 --- a/show-diff.c +++ b/show-diff.c @@ -5,7 +5,7 @@ */ #include "cache.h" -static void show_differences(char *name, +static void show_differences(char *name, void *old_contents, unsigned long long old_size) { static char cmd[1000]; @@ -31,9 +31,9 @@ static void show_diff_empty(struct cache_entry *ce) int c = 0; printf("--- %s\n", ce->name); - printf("+++ %s\n", ce->name); + printf("+++ /dev/null\n"); p = old; - end = old + size; + end = old + size; while (p < end) if (*p++ == '\n') lines ++; @@ -44,7 +44,7 @@ static void show_diff_empty(struct cache_entry *ce) if (startline) { putchar('-'); startline = 0; - } + } putchar(c); if (c == '\n') startline = 1; @@ -90,7 +90,7 @@ int main(int argc, char **argv) changed = cache_match_stat(ce, &st); if (!changed) continue; - printf("%.*s: ", ce->namelen, ce->name); + printf("%.*s: ", ce_namelen(ce), ce->name); for (n = 0; n < 20; n++) printf("%02x", ce->sha1[n]); printf("\n");