kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

[PATCH] Add "-q" option to show-diff.c 

This adds the '-q' option for show-diff.c to squelch complaints for
missing files.

It is handy if you want to run it in the merge temporary directory after
running merge-trees with its minimum checkout mode, which is the
default, because you would not find any files other than the ones that
needs human validation after the merge there. 

It also fixes the argument parsing bug Paul Mackerras noticed in
<16991.42305.118284.139777@cargo.ozlabs.ibm.com> but slightly
differently.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
maint
Junio C Hamano 2005-04-15 15:08:09 -07:00 committed by Linus Torvalds
parent b83c83457e
commit ca2a079865
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
show-diff.c
View File

@ -58,15 +58,20 @@ static void show_diff_empty(struct cache_entry *ce)
int main(int argc, char **argv)
{
int silent = 0;
int silent_on_nonexisting_files = 0;
int entries = read_cache();
int i;

while (argc-- > 1) {
if (!strcmp(argv[1], "-s")) {
silent = 1;
for (i = 1; i < argc; i++) {
if (!strcmp(argv[i], "-s")) {
silent_on_nonexisting_files = silent = 1;
continue;
}
usage("show-diff [-s]");
if (!strcmp(argv[i], "-q")) {
silent_on_nonexisting_files = 1;
continue;
}
usage("show-diff [-s] [-q]");
}

if (entries < 0) {
@ -82,8 +87,10 @@ int main(int argc, char **argv)
void *new;

if (stat(ce->name, &st) < 0) {
if (errno == ENOENT && silent_on_nonexisting_files)
continue;
printf("%s: %s\n", ce->name, strerror(errno));
if (errno == ENOENT && !silent)
if (errno == ENOENT)
show_diff_empty(ce);
continue;
}