diff options
author | Clemens Buchacher <drizzd@aon.at> | 2011-08-01 23:19:58 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-08-11 13:04:16 -0700 |
commit | 0f64bfa9567f697d6152ef9ea937d4b573029a08 (patch) | |
tree | fa7e4a84d1918c4c389d6239b6a736818a69288d /quote.c | |
parent | d5b66299040969706dd675c021f4336a26a6cc82 (diff) | |
download | git-0f64bfa9567f697d6152ef9ea937d4b573029a08.tar.gz |
ls-files: fix pathspec display on error
The following sequence of commands reveals an issue with error
reporting of relative paths:
$ mkdir sub
$ cd sub
$ git ls-files --error-unmatch ../bbbbb
error: pathspec 'b' did not match any file(s) known to git.
$ git commit --error-unmatch ../bbbbb
error: pathspec 'b' did not match any file(s) known to git.
This bug is visible only if the normalized path (i.e., the relative
path from the repository root) is longer than the prefix.
Otherwise, the code skips over the normalized path and reads from
an unused memory location which still contains a leftover of the
original command line argument.
So instead, use the existing facilities to deal with relative paths
correctly.
Also fix inconsistency between "checkout" and "commit", e.g.
$ cd Documentation
$ git checkout nosuch.txt
error: pathspec 'Documentation/nosuch.txt' did not match...
$ git commit nosuch.txt
error: pathspec 'nosuch.txt' did not match...
by propagating the prefix down the codepath that reports the error.
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'quote.c')
-rw-r--r-- | quote.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -325,8 +325,12 @@ static const char *path_relative(const char *in, int len, if (len < 0) len = strlen(in); - if (prefix && prefix_len < 0) - prefix_len = strlen(prefix); + if (prefix_len < 0) { + if (prefix) + prefix_len = strlen(prefix); + else + prefix_len = 0; + } off = 0; i = 0; |