diff options
Diffstat (limited to 'show-diff.c')
| -rw-r--r-- | show-diff.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/show-diff.c b/show-diff.c index 9f82c05602..bc3791aaaa 100644 --- a/show-diff.c +++ b/show-diff.c @@ -57,9 +57,18 @@ static void show_diff_empty(struct cache_entry *ce) int main(int argc, char **argv) { + int silent = 0; int entries = read_cache(); int i; + while (argc-- > 1) { + if (!strcmp(argv[1], "-s")) { + silent = 1; + continue; + } + usage("show-diff [-s]"); + } + if (entries < 0) { perror("read_cache"); exit(1); @@ -74,7 +83,7 @@ int main(int argc, char **argv) if (stat(ce->name, &st) < 0) { printf("%s: %s\n", ce->name, strerror(errno)); - if (errno == ENOENT) + if (errno == ENOENT && !silent) show_diff_empty(ce); continue; } @@ -86,6 +95,9 @@ int main(int argc, char **argv) printf("%02x", ce->sha1[n]); printf("\n"); fflush(stdout); + if (silent) + continue; + new = read_sha1_file(ce->sha1, type, &size); show_differences(ce->name, new, size); free(new); |