summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-03-30 14:07:15 -0700
committerJunio C Hamano <gitster@pobox.com>2017-03-30 14:07:15 -0700
commit3736c925580f678f601d670983f7f6cda791d108 (patch)
treed976750cdea8442fa885712354b5c1ab54d45563 /git.c
parentccf680dea305e0b2bda31a29c37e40e5beb397c8 (diff)
parentb2dfeb7c005b83145e9f61305658f5dac745482a (diff)
downloadgit-3736c925580f678f601d670983f7f6cda791d108.tar.gz
Merge branch 'bw/recurse-submodules-relative-fix'
A few commands that recently learned the "--recurse-submodule" option misbehaved when started from a subdirectory of the superproject. * bw/recurse-submodules-relative-fix: ls-files: fix bug when recursing with relative pathspec ls-files: fix typo in variable name grep: fix bug when recursing with relative pathspec setup: allow for prefix to be passed to git commands grep: fix help text typo
Diffstat (limited to 'git.c')
-rw-r--r--git.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/git.c b/git.c
index 33f52acbcc..8ff44f081d 100644
--- a/git.c
+++ b/git.c
@@ -361,8 +361,6 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
if (!help && get_super_prefix()) {
if (!(p->option & SUPPORT_SUPER_PREFIX))
die("%s doesn't support --super-prefix", p->cmd);
- if (prefix)
- die("can't use --super-prefix from a subdirectory");
}
if (!help && p->option & NEED_WORK_TREE)