From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: "Dennis Kaarsemaker" <dennis@kaarsemaker.net>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 04/16] diff: skip implicit no-index check when given --no-index
Date: Mon, 12 Sep 2016 20:23:27 -0700 [thread overview]
Message-ID: <20160913032327.d4v5s4h3wfy4vj3y@sigill.intra.peff.net> (raw)
In-Reply-To: <20160913032242.coyuhyhn6uklewuk@sigill.intra.peff.net>
We can invoke no-index mode in two ways: by an explicit
request from the user, or implicitly by noticing that we
have two paths, and at least one is outside the repository.
If the user already told us --no-index, there is no need for
us to do the implicit test at all. However, we currently
do, and downgrade our "explicit" to DIFF_NO_INDEX_IMPLICIT.
This doesn't have any user-visible behavior, though it's not
immediately obvious why. We only trigger the implicit check
when we have exactly two non-option arguments. And the only
code that cares about implicit versus explicit is an error
message that we show when we _don't_ have two non-option
arguments.
However, it's worth fixing anyway. Besides being slightly
more efficient, it makes the code easier to follow, which
will help when we modify it in future patches.
Signed-off-by: Jeff King <peff@peff.net>
---
builtin/diff.c | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/builtin/diff.c b/builtin/diff.c
index b7a9405..a31643c 100644
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -301,20 +301,21 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
break;
}
- if (!no_index)
+ if (!no_index) {
prefix = setup_git_directory_gently(&nongit);
- /*
- * Treat git diff with at least one path outside of the
- * repo the same as if the command would have been executed
- * outside of a git repository. In this case it behaves
- * the same way as "git diff --no-index <a> <b>", which acts
- * as a colourful "diff" replacement.
- */
- if (nongit || ((argc == i + 2) &&
- (!path_inside_repo(prefix, argv[i]) ||
- !path_inside_repo(prefix, argv[i + 1]))))
- no_index = DIFF_NO_INDEX_IMPLICIT;
+ /*
+ * Treat git diff with at least one path outside of the
+ * repo the same as if the command would have been executed
+ * outside of a git repository. In this case it behaves
+ * the same way as "git diff --no-index <a> <b>", which acts
+ * as a colourful "diff" replacement.
+ */
+ if (nongit || ((argc == i + 2) &&
+ (!path_inside_repo(prefix, argv[i]) ||
+ !path_inside_repo(prefix, argv[i + 1]))))
+ no_index = DIFF_NO_INDEX_IMPLICIT;
+ }
if (!no_index)
gitmodules_config();
--
2.10.0.230.g6f8d04b
next prev parent reply other threads:[~2016-09-13 3:23 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-13 3:22 [PATCH 0/16] fix config-reading in non-repos Jeff King
2016-09-13 3:23 ` [PATCH 01/16] t1007: factor out repeated setup Jeff King
2016-09-13 21:42 ` Stefan Beller
2016-09-13 3:23 ` [PATCH 02/16] hash-object: always try to set up the git repository Jeff King
2016-09-13 3:23 ` [PATCH 03/16] patch-id: use RUN_SETUP_GENTLY Jeff King
2016-09-13 3:23 ` Jeff King [this message]
2016-09-13 3:23 ` [PATCH 05/16] diff: handle --no-index prefixes consistently Jeff King
2016-09-13 3:23 ` [PATCH 06/16] diff: always try to set up the repository Jeff King
2016-09-13 22:00 ` Stefan Beller
2016-09-13 22:22 ` Jeff King
2016-09-13 3:23 ` [PATCH 07/16] pager: remove obsolete comment Jeff King
2016-09-13 3:23 ` [PATCH 08/16] pager: stop loading git_default_config() Jeff King
2016-09-13 3:23 ` [PATCH 09/16] pager: make pager_program a file-local static Jeff King
2016-09-13 3:23 ` [PATCH 10/16] pager: use callbacks instead of configset Jeff King
2016-09-13 3:23 ` [PATCH 11/16] pager: handle early config Jeff King
2016-09-13 3:24 ` [PATCH 12/16] t1302: use "git -C" Jeff King
2016-09-13 3:24 ` [PATCH 13/16] test-config: setup git directory Jeff King
2016-09-13 3:24 ` [PATCH 14/16] config: only read .git/config from configured repos Jeff King
2016-09-13 3:24 ` [PATCH 15/16] init: expand comments explaining config trickery Jeff King
2016-09-13 3:24 ` [PATCH 16/16] init: reset cached config when entering new repo Jeff King
2016-09-13 22:18 ` Stefan Beller
2016-09-14 10:55 ` [PATCH 0/16] fix config-reading in non-repos Dennis Kaarsemaker
2016-09-14 15:31 ` Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160913032327.d4v5s4h3wfy4vj3y@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=dennis@kaarsemaker.net \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).