When the len passed was -1, relative paths shortening was broken, resulting
in too long paths.
Signed-off-by: Pierre Habouzit <madcoder@xxxxxxxxxx>
---
On Sun, Dec 02, 2007 at 11:39:59PM +0000, David Symonds wrote:
> On Dec 3, 2007 9:04 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> > Please do not take this as the final decision made by the Emperor, whose
> > subjects now must follow. This is a sanity-check to see if everybody is
> > on the same page.
> >
> > I am not the Emperor anyway ;-)
> >
>
> > Topics not in 'master' yet but should be in v1.5.4
> > --------------------------------------------------
> >
> > I think the following should go in, along with what we already have in
> > 'master':
>
> Can we add the git-status/git-checkout relative path stuff that's
> currently been sitting in 'next'? It would be a good step forward for
> usability.
Speaking of which, there is this irritating bug in git status that
let it show too long paths in the first chunk (the "tracked files"
one).
The previous version of the function was avoiding very hard to
compute "in" length, and had quite convoluted code because of that.
I now compute it at the beginning. The real issue was the:
while (prefix[off] && off < len && prefix[off] == in[off])
line, when len is negative, the shortening never happens. I could
have fixed it using ((len < 0 && in[off]) || off < len), but I
disliked the resulting code, so I went for this.
--
·O· Pierre Habouzit
··O madcoder@xxxxxxxxxx
OOO http://www.madism.org
wt-status.c | 31 +++++++++++++------------------
1 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/wt-status.c b/wt-status.c
index 0e0439f..eb2cbea 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -84,30 +84,25 @@ static void wt_status_print_trailer(struct wt_status *s)
static char *quote_path(const char *in, int len,
struct strbuf *out, const char *prefix)
{
- if (len > 0)
- strbuf_grow(out, len);
+ int pos = 0;
+
+ if (len < 0)
+ len = strlen(in);
+ strbuf_grow(out, len);
strbuf_setlen(out, 0);
if (prefix) {
int off = 0;
while (prefix[off] && off < len && prefix[off] == in[off])
- if (prefix[off] == '/') {
- prefix += off + 1;
- in += off + 1;
- len -= off + 1;
- off = 0;
- } else
- off++;
-
- for (; *prefix; prefix++)
- if (*prefix == '/')
+ if (prefix[off++] == '/')
+ pos = off;
+ while (prefix[off])
+ if (prefix[off++] == '/')
strbuf_addstr(out, "../");
}
- for (; (len < 0 && *in) || len > 0; in++, len--) {
- int ch = *in;
-
- switch (ch) {
+ for (; pos < len; pos++) {
+ switch (in[pos]) {
case '\n':
strbuf_addstr(out, "\\n");
break;
@@ -115,8 +110,8 @@ static char *quote_path(const char *in, int len,
strbuf_addstr(out, "\\r");
break;
default:
- strbuf_addch(out, ch);
- continue;
+ strbuf_addch(out, in[pos]);
+ break;
}
}
--
1.5.3.7.2065.g3d18-dirty
Attachment:
pgpiojZ4GQRYG.pgp
Description: PGP signature
