From: Stefan Beller <sbeller@google.com>
To: peff@peff.net
Cc: git@vger.kernel.org, bmwill@google.com,
Stefan Beller <sbeller@google.com>
Subject: [PATCHv2] pathspec: give better message for submodule related pathspec error
Date: Wed, 28 Dec 2016 09:17:46 -0800 [thread overview]
Message-ID: <20161228171746.22859-1-sbeller@google.com> (raw)
In-Reply-To: <20161228055826.xu2gclwkvisbft6o@sigill.intra.peff.net>
Every once in a while someone complains to the mailing list to have
run into this weird assertion[1].
The usual response from the mailing list is link to old discussions[2],
and acknowledging the problem stating it is known.
For now just improve the user visible error message.
[1] https://www.google.com/search?q=item-%3Enowildcard_len
[2] http://git.661346.n2.nabble.com/assert-failed-in-submodule-edge-case-td7628687.html
https://www.spinics.net/lists/git/msg249473.html
Signed-off-by: Stefan Beller <sbeller@google.com>
---
Peff wrote:
> Don't you need to flip the logic here? An assert() triggers when the
> condition is not true, but an "if" does the opposite. So "assert(X)"
> should always become "if (!X) die(...)".
Duh! and it should compile as well.
Thanks,
Stefan
pathspec.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/pathspec.c b/pathspec.c
index 22ca74a126..4724d522f2 100644
--- a/pathspec.c
+++ b/pathspec.c
@@ -313,8 +313,11 @@ static unsigned prefix_pathspec(struct pathspec_item *item,
}
/* sanity checks, pathspec matchers assume these are sane */
- assert(item->nowildcard_len <= item->len &&
- item->prefix <= item->len);
+ if (item->nowildcard_len > item->len ||
+ item->prefix > item->len)
+ die (_("Path leads inside submodule '%s', but the submodule "
+ "was not recognized, i.e. not initialized or deleted"),
+ item->original);
return magic;
}
--
2.11.0.196.gee862f456e.dirty
next prev parent reply other threads:[~2016-12-28 17:18 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-28 0:05 [PATCH] pathspec: give better message for submodule related pathspec error Stefan Beller
2016-12-28 5:58 ` Jeff King
2016-12-28 17:17 ` Stefan Beller [this message]
2016-12-28 18:15 ` [PATCHv2] " Brandon Williams
2016-12-28 18:13 ` [PATCH] " Brandon Williams
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=20161228171746.22859-1-sbeller@google.com \
--to=sbeller@google.com \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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).