From: Michel Marti <mma@objectxp.com>
To: git@vger.kernel.org
Subject: Re: [PATCH REPLACEMENT for 2/2] git status: show relative paths when run in a subdirectory
Date: Sat, 10 Nov 2007 13:08:30 +0100 [thread overview]
Message-ID: <fh46vv$ooj$1@ger.gmane.org> (raw)
In-Reply-To: <Pine.LNX.4.64.0711091529570.4362@racer.site>
Untracked files in the current dir don't include the relative path
to the project-root, but changed/updated files do:
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# new file: ../subdir/hello
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# world
With the patch below (on top of your changes), the output becomes
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# new file: hello
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# world
Cheers,
- Michel
diff --git a/wt-status.c b/wt-status.c
index 0d25362..2cdc8ce 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -133,8 +133,8 @@ static void wt_status_print_filepair(struct wt_status *s,
strbuf_init(&onebuf, 0);
strbuf_init(&twobuf, 0);
- one = quote_path(p->one->path, -1, &onebuf, s->prefix);
- two = quote_path(p->two->path, -1, &twobuf, s->prefix);
+ one = quote_path(p->one->path, strlen(p->one->path), &onebuf, s->prefix);
+ two = quote_path(p->two->path, strlen(p->two->path), &twobuf, s->prefix);
color_fprintf(s->fp, color(WT_STATUS_HEADER), "#\t");
switch (p->status) {
@@ -233,7 +233,8 @@ static void wt_status_print_initial(struct wt_status *s)
for (i = 0; i < active_nr; i++) {
color_fprintf(s->fp, color(WT_STATUS_HEADER), "#\t");
color_fprintf_ln(s->fp, color(WT_STATUS_UPDATED), "new file: %s",
- quote_path(active_cache[i]->name, -1,
+ quote_path(active_cache[i]->name,
+ strlen(active_cache[i]->name),
&buf, s->prefix));
}
if (active_nr)
next prev parent reply other threads:[~2007-11-10 12:09 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-07 22:15 Inconsistencies with git log Jon Smirl
2007-11-07 22:42 ` Johannes Schindelin
2007-11-07 22:45 ` Jon Smirl
2007-11-07 22:58 ` Johannes Schindelin
2007-11-07 23:03 ` Jon Smirl
2007-11-07 23:11 ` Johannes Schindelin
2007-11-07 23:16 ` Jon Smirl
2007-11-07 23:29 ` Jon Smirl
2007-11-08 0:04 ` Johannes Schindelin
2007-11-08 0:09 ` Jon Smirl
2007-11-08 0:16 ` Andreas Ericsson
2007-11-08 0:35 ` Johannes Schindelin
2007-11-09 15:54 ` Linus Torvalds
2007-11-09 17:20 ` Jon Smirl
2007-11-09 17:38 ` Linus Torvalds
2007-11-09 17:53 ` Linus Torvalds
2007-11-09 18:04 ` Jon Smirl
2007-11-09 18:14 ` Linus Torvalds
2007-11-09 18:22 ` Peter Baumann
2007-11-09 18:35 ` Junio C Hamano
2007-11-09 18:37 ` Jakub Narebski
2007-11-09 18:39 ` Peter Baumann
2007-11-09 18:36 ` Linus Torvalds
2007-11-09 17:41 ` Jakub Narebski
2007-11-08 9:24 ` Wincent Colaiuta
2007-11-08 18:28 ` Daniel Barkalow
2007-11-07 23:19 ` Brian Gernhardt
2007-11-07 23:31 ` David Symonds
2007-11-08 0:09 ` Johannes Schindelin
2007-11-08 0:14 ` David Symonds
2007-11-08 0:52 ` Brian Gernhardt
2007-11-08 0:10 ` [PATCH 1/2] Makefile: wt-status.h is also a lib header Johannes Schindelin
2007-11-08 0:11 ` Inconsistencies with git log Andreas Ericsson
2007-11-08 8:29 ` Peter Baumann
2007-11-08 13:16 ` David Symonds
2007-11-08 13:40 ` Andreas Ericsson
2007-11-08 21:21 ` Alex Riesen
2007-11-08 21:23 ` Alex Riesen
2007-11-08 0:12 ` [PATCH 2/2] git status: show relative paths when run in a subdirectory Johannes Schindelin
2007-11-08 0:53 ` David Symonds
2007-11-08 1:00 ` Johannes Schindelin
2007-11-08 8:26 ` Junio C Hamano
2007-11-09 15:30 ` [PATCH REPLACEMENT for " Johannes Schindelin
2007-11-10 12:08 ` Michel Marti [this message]
2007-11-10 14:10 ` Johannes Schindelin
2007-11-08 9:19 ` Inconsistencies with git log Wincent Colaiuta
2007-11-10 22:51 ` Miles Bader
2007-11-07 23:00 ` David Symonds
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='fh46vv$ooj$1@ger.gmane.org' \
--to=mma@objectxp.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.