From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>, git@vger.kernel.org
Subject: [PATCH] quote_path: convert empty path to "./"
Date: Fri, 7 Dec 2007 11:57:04 -0500 [thread overview]
Message-ID: <20071207165703.GA8889@sigill.intra.peff.net> (raw)
Now that we are correctly removing leading prefixes from files in git
status, there is a degenerate case: the directory matching the prefix.
Because we show only the directory name for a directory that contains
only untracked files, it gets collapsed to an empty string.
Example:
$ git init
$ mkdir subdir
$ touch subdir/file
$ git status
...
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# subdir/
So far, so good.
$ cd subdir
$ git status
....
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
#
Oops, that's a bit confusing.
This patch prints './' to show that there is some output.
---
I think it looks a bit ugly because it is so small (though just '.' was
even worse). But I don't see what else would make sense.
wt-status.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/wt-status.c b/wt-status.c
index 02dbb75..31d83bf 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -121,6 +121,9 @@ static char *quote_path(const char *in, int len,
}
}
+ if (!out->len)
+ strbuf_addstr(out, "./");
+
return out->buf;
}
--
1.5.3.7.2156.g3d791-dirty
next reply other threads:[~2007-12-07 16:57 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-07 16:57 Jeff King [this message]
2007-12-07 18:54 ` [PATCH] quote_path: convert empty path to "./" Johannes Schindelin
2007-12-07 19:05 ` Thomas Harning
2007-12-07 20:49 ` Jeff King
2007-12-07 21:26 ` [PATCH] add status.relativePaths config variable Jeff King
2007-12-08 7:34 ` Junio C Hamano
2007-12-08 7:47 ` Junio C Hamano
2007-12-08 8:02 ` Jeff King
2007-12-08 8:05 ` Junio C Hamano
2007-12-08 8:45 ` Jeff King
2007-12-08 7:55 ` Jeff King
2007-12-08 8:14 ` Junio C Hamano
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=20071207165703.GA8889@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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 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 NNTP newsgroup(s).