summaryrefslogtreecommitdiff
path: root/show-diff.c
diff options
context:
space:
mode:
authorPetr Baudis <xpasky@machine>2005-04-13 08:40:09 (GMT)
committerPetr Baudis <xpasky@machine>2005-04-13 08:40:09 (GMT)
commite2e5e98a40d6ed04b7acf791cc2243ff32923db3 (patch)
tree2ce9f0ac1f9d9035ec6ca90ec4f3922a127c6c02 /show-diff.c
parent3d8c7a57903f91decd5e6c531974a1af1aaa3c97 (diff)
downloadgit-e2e5e98a40d6ed04b7acf791cc2243ff32923db3.zip
git-e2e5e98a40d6ed04b7acf791cc2243ff32923db3.tar.gz
git-e2e5e98a40d6ed04b7acf791cc2243ff32923db3.tar.bz2
[PATCH] Silent flag for show-diff
This patch adds a -s flag for show-diff, which will surpress the actual diffing. This is useful for my scripts when they just want to see what needs to be updated in the cache. Signed-off-by: Petr Baudis <pasky@ucw.cz>
Diffstat (limited to 'show-diff.c')
-rw-r--r--show-diff.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/show-diff.c b/show-diff.c
index 9f82c05..bc3791a 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);