From: Stefan Beller <sbeller@google.com>
To: bmwill@google.com
Cc: git@vger.kernel.org, Stefan Beller <sbeller@google.com>
Subject: [PATCH] pathspec: give better message for submodule related pathspec error
Date: Tue, 27 Dec 2016 16:05:59 -0800 [thread overview]
Message-ID: <20161228000559.17842-1-sbeller@google.com> (raw)
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>
---
If you were following the mailing list closely today, you may sense
that I am cleaning up stalled branches. :)
I think such a hot fix is warranted given how often we had reports
on the mailing list.
Thanks,
Stefan
pathspec.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/pathspec.c b/pathspec.c
index 22ca74a126..d522f43331 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"),
+ ce->name);
return magic;
}
--
2.11.0.196.gee862f456e.dirty
next reply other threads:[~2016-12-28 0:06 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-28 0:05 Stefan Beller [this message]
2016-12-28 5:58 ` [PATCH] pathspec: give better message for submodule related pathspec error Jeff King
2016-12-28 17:17 ` [PATCHv2] " Stefan Beller
2016-12-28 18:15 ` Brandon Williams
2016-12-28 18:13 ` [PATCH] " Brandon Williams
2016-12-29 19:29 Stefan Beller
2017-01-01 1:11 ` Junio C Hamano
2017-01-03 18:15 ` Stefan Beller
2017-01-04 1:23 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161228000559.17842-1-sbeller@google.com \
--to=sbeller@google.com \
--cc=bmwill@google.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.