summaryrefslogtreecommitdiff
path: root/diff-no-index.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-09-17 11:42:44 -0700
committerJunio C Hamano <gitster@pobox.com>2013-09-17 11:42:44 -0700
commitcd8c891b7403754cc7f4b5ace0f799adb83d3218 (patch)
tree6e2e6b048303471b81b45647043d1e995b690314 /diff-no-index.c
parent8fbb07e3f37ab53febd0b2fc0f64811c68cd2492 (diff)
parent286bc123cdabed76a1da25a32e97d392b37d51a2 (diff)
downloadgit-cd8c891b7403754cc7f4b5ace0f799adb83d3218.tar.gz
Merge branch 'dw/diff-no-index-doc'
When the user types "git diff" outside a working tree, thinking he is inside one, the current error message that is a single-liner "usage: git diff --no-index <path> <path>" may not be sufficient to make him realize the mistake. Add "Not a git repository" to the error message when we fell into the "--no-index" mode without an explicit command line option to instruct us to do so. * dw/diff-no-index-doc: diff --no-index: describe in a separate paragraph diff --no-index: clarify operation when not inside a repository
Diffstat (limited to 'diff-no-index.c')
-rw-r--r--diff-no-index.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/diff-no-index.c b/diff-no-index.c
index e301aafff9..00a8eefde9 100644
--- a/diff-no-index.c
+++ b/diff-no-index.c
@@ -215,9 +215,21 @@ void diff_no_index(struct rev_info *revs,
path_inside_repo(prefix, argv[i+1])))
return;
}
- if (argc != i + 2)
+ if (argc != i + 2) {
+ if (!no_index) {
+ /*
+ * There was no --no-index and there were not two
+ * paths. It is possible that the user intended
+ * to do an inside-repository operation.
+ */
+ fprintf(stderr, "Not a git repository\n");
+ fprintf(stderr,
+ "To compare two paths outside a working tree:\n");
+ }
+ /* Give the usage message for non-repository usage and exit. */
usagef("git diff %s <path> <path>",
no_index ? "--no-index" : "[--no-index]");
+ }
diff_setup(&revs->diffopt);
for (i = 1; i < argc - 2; ) {