threads / patch / 2992

patch, 3 partsls-files --others --directory: give trailing slash

Subject: [PATCH 2/3] ls-files --others --directory: give trailing slash

## tl;dr

3 messages between Jan 7, 2006 and Jan 9, 2006. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Junio C Hamano· Jan 7, 2006, 22:31 UTC · lore

This adds a trailing slash to directory names in the output when "--others --directory" option shows only untracked directories and not their contents, to make them stand out.

Signed-off-by: Junio C Hamano <junkio@cox.net>

---

 * Likes, dislikes?  This suits better for *my* purpose of
   calling this from git-status, but it might be undesirable for
   your Porcelain.

 ls-files.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

02e90a13cce6041263ec90da77f2ba929055b448

Show changes to ls-files.c +3 −1

diff --git a/ls-files.c b/ls-files.c
index cc5b32e..7e2fdea 100644
--- a/ls-files.c
+++ b/ls-files.c
@@ -294,8 +294,10 @@ static void read_directory(const char *p
 			case DT_DIR:
 				memcpy(fullname + baselen + len, "/", 2);
 				if (show_other_directories &&
-				    !dir_exists(fullname, baselen + len + 1))
+				    !dir_exists(fullname, baselen + len + 1)) {
+					len++;
 					break;
+				}
 				read_directory(fullname, fullname,
 					       baselen + len + 1);
 				continue;

-- 
1.0.7-g0263

Linus Torvalds· Jan 7, 2006, 23:35 UTC · re: Junio C Hamano · lore

Re: [PATCH 2/3] ls-files --others --directory: give trailing slash

On Sat, 7 Jan 2006, Junio C Hamano wrote:

> 
>  * Likes, dislikes?  This suits better for *my* purpose of
>    calling this from git-status, but it might be undesirable for
>    your Porcelain.

Likes.

However, I'd re-write it as just

	memcpy(fullname + baselen + len, "/", 2);
	len++;
	if (show_other_directories &&
	    !dir_exists(fullname, baselen + len))
		break;
	read_directory(fullname, fullname, baselen + len);

because let's face it, every user wants the "+1", so just do it once up-front instead of adding one in three different places.

		Linus

Darrin Thompson· Jan 9, 2006, 15:17 UTC · re: Junio C Hamano · lore

Re: [PATCH 2/3] ls-files --others --directory: give trailing slash

On Sat, 2006-01-07 at 14:31 -0800, Junio C Hamano wrote:

>  * Likes, dislikes?  This suits better for *my* purpose of
>    calling this from git-status, but it might be undesirable for
>    your Porcelain.
>

+1 likes.

-- Darrin