From: Michael J Gruber <git@drmicha.warpmail.net>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, rrt@sc3d.org, john@szakmeister.net
Subject: [RFC/PATCH] ls-files: fix pathspec display on error
Date: Wed, 27 Jul 2011 13:56:14 +0200 [thread overview]
Message-ID: <b535c21e1becdf8aeeb1d3f8ddaa7f5415830844.1311767679.git.git@drmicha.warpmail.net> (raw)
In-Reply-To: <CAEBDL5XJbYT9yczZiVPpeA3mpROuKQdw+-AOJjUmRp4W6M5uzg@mail.gmail.com>
Trying to commit or ls a file "../$a" from within a subdirectory "aha"
gives the following output, when "$a" runs through the values "a", "aa"
etc.:
error: pathspec '../a' did not match any file(s) known to git.
error: pathspec '../aa' did not match any file(s) known to git.
error: pathspec '../aaa' did not match any file(s) known to git.
error: pathspec '' did not match any file(s) known to git.
error: pathspec 'a' did not match any file(s) known to git.
error: pathspec 'aa' did not match any file(s) known to git.
error: pathspec 'aaa' did not match any file(s) known to git.
error: pathspec 'aaaa' did not match any file(s) known to git.
error: pathspec 'aaaaa' did not match any file(s) known to git.
error: pathspec 'aaaaaa' did not match any file(s) known to git.
This comes from the fact that report_path_error() tries to chop off a
prefix from the pathspec which may have been resolved and consumed already.
Fix this by displaying the full pathspec.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
---
So, I couldn't reproduce because it depends on the length of the dirname.
This may be fallout from efad1a5 (ls-files: allow relative pathspec, 2010-06-03)
but I haven't checked and won't be able to for the next 3 weeks, sorry.
I just wanted to send out this possible fix before I leave.
---
builtin/ls-files.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index 1570123..e0b1401 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -418,7 +418,7 @@ int report_path_error(const char *ps_matched, const char **pathspec, int prefix_
continue;
error("pathspec '%s' did not match any file(s) known to git.",
- pathspec[num] + prefix_len);
+ pathspec[num]);
errors++;
}
return errors;
--
1.7.6.336.gdf067
next prev parent reply other threads:[~2011-07-27 11:56 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-23 20:25 Possible bug Reuben Thomas
2011-07-25 7:42 ` [RFC/PATCH] commit: allow partial commits with relative paths Michael J Gruber
2011-07-25 19:02 ` Junio C Hamano
2011-07-25 19:32 ` Junio C Hamano
2011-07-27 8:22 ` Michael J Gruber
2011-07-27 9:45 ` Reuben Thomas
2011-07-27 9:53 ` Michael J Gruber
2011-07-27 10:00 ` Reuben Thomas
2011-07-27 10:19 ` John Szakmeister
2011-07-27 11:56 ` Michael J Gruber [this message]
2011-07-29 13:03 ` [RFC/PATCH] ls-files: fix pathspec display on error Clemens Buchacher
2011-08-01 0:01 ` Junio C Hamano
2011-08-01 18:03 ` [PATCH] test ls-files with relative paths Clemens Buchacher
2011-08-01 20:14 ` Junio C Hamano
2011-08-01 21:19 ` [PATCH v2] ls-files: fix pathspec display on error Clemens Buchacher
2011-08-01 22:30 ` Junio C Hamano
2011-07-28 7:38 ` [RFC/PATCH] commit: allow partial commits with relative paths Erik Faye-Lund
2011-07-27 15:37 ` Junio C Hamano
2011-07-27 15:41 ` Junio C Hamano
2011-07-27 15:50 ` Michael J Gruber
2011-07-29 13:35 ` [PATCH] " Clemens Buchacher
2011-07-30 16:45 ` Michael J Gruber
2011-07-30 17:00 ` Clemens Buchacher
2011-07-30 17:04 ` Michael J Gruber
2011-07-30 17:13 ` [PATCH v2] " Clemens Buchacher
2011-08-01 0:05 ` Junio C Hamano
2011-08-02 21:31 ` Junio C Hamano
2011-08-03 19:28 ` Clemens Buchacher
2011-08-03 22:07 ` Junio C Hamano
2011-09-04 10:41 ` renaming pathspec_prefix (was: Re: [PATCH v2] commit: allow partial commits with relative paths) Clemens Buchacher
2011-09-04 10:41 ` [PATCH 1/3] remove prefix argument from pathspec_prefix Clemens Buchacher
2011-09-06 19:02 ` Junio C Hamano
2011-09-06 19:58 ` Junio C Hamano
2011-09-08 7:12 ` Clemens Buchacher
2011-09-08 16:51 ` Junio C Hamano
2011-09-04 10:42 ` [PATCH 2/3] consolidate pathspec_prefix and common_prefix Clemens Buchacher
2011-09-04 10:42 ` [PATCH 3/3] rename pathspec_prefix -> common_prefix and move to dir.[ch] Clemens Buchacher
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=b535c21e1becdf8aeeb1d3f8ddaa7f5415830844.1311767679.git.git@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=john@szakmeister.net \
--cc=rrt@sc3d.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.
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).