[PATCH 1/2] diff --no-index: remove nonfunctional "-q" handling
- From
Stefan Beller <stefanbeller@googlemail.com>
- Date
- Jul 16, 2013, 10:28 UTC
- Message-ID
- <1373970487-32595-2-git-send-email-stefanbeller@googlemail.com>
- In-Reply-To
- <1373970487-32595-1-git-send-email-stefanbeller@googlemail.com>
Before v1.5.6-rc1~41^2~2, the option parsing for diff --no-index and "git diff-files" shared code. In "git diff-files", "-q" means to be silent about removed files. In "git diff --no-index", in various versions it has been an error, an infinite loop, or a no-op.
Simplify the code to clarify that it is now a no-op, continuing to accept and ignore the -q option in "git diff --no-index" to avoid breaking scripts.
Signed-off-by: Stefan Beller <stefanbeller@googlemail.com> Helped-by: Jonathan Nieder <jrnieder@gmail.com> --- diff-no-index.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/diff-no-index.c b/diff-no-index.c index 74da659..419cd78 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -187,7 +187,6 @@ void diff_no_index(struct rev_info *revs, { int i, prefixlen; int no_index = 0; - unsigned options = 0; const char *paths[2]; /* Were we asked to do --no-index explicitly? */ @@ -224,10 +223,8 @@ void diff_no_index(struct rev_info *revs, int j; if (!strcmp(argv[i], "--no-index")) i++; - else if (!strcmp(argv[i], "-q")) { - options |= DIFF_SILENT_ON_REMOVED; + else if (!strcmp(argv[i], "-q")) i++; - } else if (!strcmp(argv[i], "--")) i++; else {
-- 1.8.2.3.10.g2733812