[PATCH 2/2] diff: Remove -q to stay silent on missing files.
From: Stefan Beller <hidden>
Date: 2016-06-15 22:58:11
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
This feature was not tested in the test suite, hence we'd remove it for now. It doesn't seem to be often used anyway. A google search for "git diff -q" (match string exactly) only returned http://stackoverflow.com/questions/11021287/git-detect-if-there-are-untracked-files-quickly where "git diff -q" was quoted for its exit code behavior regarding files being found or not. Signed-off-by: Stefan Beller <redacted> Proposed-by: <Jonathan Nieder> [off-list ref] --- Documentation/git-diff-files.txt | 6 +----- diff-no-index.c | 2 -- 2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt
index 906774f..d118cfb 100644
--- a/Documentation/git-diff-files.txt
+++ b/Documentation/git-diff-files.txt@@ -9,7 +9,7 @@ git-diff-files - Compares files in the working tree and the index SYNOPSIS -------- [verse] -'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>...] +'git diff-files' [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>...] DESCRIPTION -----------
@@ -41,10 +41,6 @@ omit diff output for unmerged entries and just show "Unmerged". diff, similar to the way 'diff-tree' shows a merge commit with these flags. --q:: - Remain silent even on nonexistent files - - include::diff-format.txt[] GIT
diff --git a/diff-no-index.c b/diff-no-index.c
index 419cd78..98a9cf1 100644
--- a/diff-no-index.c
+++ b/diff-no-index.c@@ -223,8 +223,6 @@ void diff_no_index(struct rev_info *revs, int j; if (!strcmp(argv[i], "--no-index")) i++; - else if (!strcmp(argv[i], "-q")) - i++; else if (!strcmp(argv[i], "--")) i++; else {
--
1.8.2.3.10.g2733812