From: Stefan Beller <stefanbeller@googlemail.com>
To: git@vger.kernel.org
Cc: Stefan Beller <stefanbeller@googlemail.com>
Subject: [PATCH 3/4] diff-no-index: Remove unused variable.
Date: Sun, 14 Jul 2013 23:35:48 +0200 [thread overview]
Message-ID: <1373837749-14402-3-git-send-email-stefanbeller@googlemail.com> (raw)
In-Reply-To: <1373837749-14402-1-git-send-email-stefanbeller@googlemail.com>
Signed-off-by: Stefan Beller <stefanbeller@googlemail.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 e66fdf3..842add4 100644
--- a/diff-no-index.c
+++ b/diff-no-index.c
@@ -181,19 +181,18 @@ static int queue_diff(struct diff_options *o,
}
}
void diff_no_index(struct rev_info *revs,
int argc, const char **argv,
int nongit, const char *prefix)
{
int i, prefixlen;
int no_index = 0;
- unsigned options = 0;
const char *paths[2];
/* Were we asked to do --no-index explicitly? */
for (i = 1; i < argc; i++) {
if (!strcmp(argv[i], "--")) {
i++;
break;
}
if (!strcmp(argv[i], "--no-index"))
@@ -218,22 +217,20 @@ void diff_no_index(struct rev_info *revs,
if (argc != i + 2)
usagef("git diff %s <path> <path>",
no_index ? "--no-index" : "[--no-index]");
diff_setup(&revs->diffopt);
for (i = 1; i < argc - 2; ) {
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 {
j = diff_opt_parse(&revs->diffopt, argv + i, argc - i);
if (!j)
die("invalid diff option/value: %s", argv[i]);
i += j;
}
}
--
1.8.3.2.806.gdee5b9b
next prev parent reply other threads:[~2013-07-14 21:35 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-14 21:35 [PATCH 1/4] daemon.c:handle: Remove unneeded check for null pointer Stefan Beller
2013-07-14 21:35 ` [PATCH 2/4] commit: Fix a memory leak in determine_author_info Stefan Beller
2013-07-14 21:49 ` Jonathan Nieder
2013-07-14 21:35 ` Stefan Beller [this message]
2013-07-14 22:07 ` [PATCH 3/4] diff-no-index: Remove unused variable Jonathan Nieder
2013-07-16 10:28 ` [PATCH 0/2] git diff -q option removal Stefan Beller
2013-07-16 10:28 ` [PATCH 1/2] diff --no-index: remove nonfunctional "-q" handling Stefan Beller
2013-07-16 10:28 ` [PATCH 2/2] diff: Remove -q to stay silent on missing files Stefan Beller
2013-07-17 17:04 ` [PATCH 0/2] git diff -q option removal Junio C Hamano
2013-07-17 18:06 ` Junio C Hamano
2013-07-17 20:05 ` Stefan Beller
2013-07-18 0:30 ` [PATCH 0/6] Deprecating "diff-files -q" Junio C Hamano
2013-07-18 0:30 ` [PATCH 1/6] diff: pass the whole diff_options to diffcore_apply_filter() Junio C Hamano
2013-07-18 0:30 ` [PATCH 2/6] diff: factor out match_filter() Junio C Hamano
2013-07-18 0:30 ` [PATCH 3/6] diff: preparse --diff-filter string argument Junio C Hamano
2013-07-18 0:30 ` [PATCH 4/6] diff: reject unknown change class given to --diff-filter Junio C Hamano
2013-07-18 0:30 ` [PATCH 5/6] diff: allow lowercase letter to specify what change class to exclude Junio C Hamano
2013-07-18 0:30 ` [PATCH 6/6] diff: deprecate -q option to diff-files Junio C Hamano
2013-07-19 3:20 ` [PATCH 7/6] diff: remove "diff-files -q" at Git 2.0 version boundary Junio C Hamano
2013-07-19 3:31 ` [PATCH 6/6] diff: deprecate -q option to diff-files Jonathan Nieder
2013-07-19 7:24 ` Junio C Hamano
2013-07-19 21:01 ` Jonathan Nieder
2013-07-14 21:35 ` [PATCH 4/4] diff.c: Do not initialize a variable, which gets reassigned anyway Stefan Beller
2013-07-14 22:18 ` Jonathan Nieder
2013-07-14 21:48 ` [PATCH 1/4] daemon.c:handle: Remove unneeded check for null pointer Jonathan Nieder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1373837749-14402-3-git-send-email-stefanbeller@googlemail.com \
--to=stefanbeller@googlemail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).