git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Erik Faye-Lund <kusmabite@gmail.com>
To: John Szakmeister <john@szakmeister.net>
Cc: Michael J Gruber <git@drmicha.warpmail.net>,
	Reuben Thomas <rrt@sc3d.org>, Junio C Hamano <gitster@pobox.com>,
	git@vger.kernel.org
Subject: Re: [RFC/PATCH] commit: allow partial commits with relative paths
Date: Thu, 28 Jul 2011 09:38:05 +0200	[thread overview]
Message-ID: <CABPQNSb_k8Ye1zaD6rJcfXPT1_pOU9NBG_Z7pFDgNqtUyL4GUQ@mail.gmail.com> (raw)
In-Reply-To: <CAEBDL5XJbYT9yczZiVPpeA3mpROuKQdw+-AOJjUmRp4W6M5uzg@mail.gmail.com>

On Wed, Jul 27, 2011 at 12:19 PM, John Szakmeister <john@szakmeister.net> wrote:
> On Wed, Jul 27, 2011 at 5:53 AM, Michael J Gruber
> <git@drmicha.warpmail.net> wrote:
> [snip]
>> I can't reproduce that name truncation with a current git, btw. (So I
>> won't bother bisecting where we removed a spurious offset by "prefix".)
>
> I can:
>
> :: git --version
> git version 1.7.6.347.g4db0d
> :: git init reproduce-bug
> Initialized empty Git repository in /Users/jszakmeister/tmp/reproduce-bug/.git/
> :: cd reproduce-bug
> :: echo foo > foo.txt
> :: mkdir bar
> :: echo bar bar/bar.txt
> bar bar/bar.txt
> :: git add .
> :: git commit -m '.'
> [master (root-commit) a5f76f1] .
>  2 files changed, 2 insertions(+), 0 deletions(-)
>  create mode 100644 bar/bar.txt
>  create mode 100644 foo.txt
> :: cd bar
> :: git rm ../foo.txt
> rm 'foo.txt'
> :: git commit ../foo.txt
> error: pathspec 'txt' did not match any file(s) known to git.

What seems to happen here, is report_path_error gets called with a
pathspec that doesn't contain the prefix (which is "bar/"), yet it
tries to skip prefix_len characters ahead in it when reporting.

Why the pathspec isn't prefixed by "bar/" is because of the
normalize_path_copy-call in prefix_path, when called through
get_pathspec("bar/", {"../foo.txt", NULL}).

  parent reply	other threads:[~2011-07-28  7:38 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             ` [RFC/PATCH] ls-files: fix pathspec display on error Michael J Gruber
2011-07-29 13:03               ` 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             ` Erik Faye-Lund [this message]
2011-07-27 15:37       ` [RFC/PATCH] commit: allow partial commits with relative paths 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=CABPQNSb_k8Ye1zaD6rJcfXPT1_pOU9NBG_Z7pFDgNqtUyL4GUQ@mail.gmail.com \
    --to=kusmabite@gmail.com \
    --cc=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).