* [PATCH] Support symlinks in git-ls-files --others.
@ 2005-05-12 7:48 Junio C Hamano
0 siblings, 0 replies; only message in thread
From: Junio C Hamano @ 2005-05-12 7:48 UTC (permalink / raw
To: pasky, Kay Sievers; +Cc: git
It is kind of surprising that this was missed in the last round,
but the work tree scanner in git-ls-files is still deliberately
ignoring symlinks. This patch fixes it.
This depends on the test suite infrastructure I sent in earlier.
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
Petr, I am not CCing Linus and you know what I mean by it ;-).
cache.h | 1 +
ls-files.c | 8 +++++---
t/t0400-ls-files.sh | 29 +++++++++++++++++++++++++++++
3 files changed, 35 insertions(+), 3 deletions(-)
t/t0400-ls-files.sh (. --> 100755)
--- a/cache.h
+++ b/cache.h
@@ -27,6 +27,7 @@
#define DT_UNKNOWN 0
#define DT_DIR 1
#define DT_REG 2
+#define DT_LNK 3
#define DTYPE(de) DT_UNKNOWN
#endif
--- a/ls-files.c
+++ b/ls-files.c
@@ -109,8 +109,9 @@
/*
* Read a directory tree. We currently ignore anything but
- * directories and regular files. That's because git doesn't
- * handle them at all yet. Maybe that will change some day.
+ * directories, regular files and symlinks. That's because git
+ * doesn't handle them at all yet. Maybe that will change some
+ * day.
*
* Also, we currently ignore all names starting with a dot.
* That likely will not change.
@@ -141,7 +142,7 @@
case DT_UNKNOWN:
if (lstat(fullname, &st))
continue;
- if (S_ISREG(st.st_mode))
+ if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode))
break;
if (!S_ISDIR(st.st_mode))
continue;
@@ -152,6 +153,7 @@
baselen + len + 1);
continue;
case DT_REG:
+ case DT_LNK:
break;
}
add_name(fullname, baselen + len);
--- a/t/t0400-ls-files.sh
+++ b/t/t0400-ls-files.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# Copyright (c) 2005 Junio C Hamano
+#
+
+. ./test-lib.sh
+test_description "$@" 'git-ls-files test.
+
+This test runs git-ls-files --others with the following on the
+filesystem.
+
+ path0 - a file
+ path1 - a symlink
+ path2/file2 - a file in a directory
+'
+
+date >path0
+ln -s xyzzy path1
+mkdir path2
+date >path2/file2
+git-ls-files --others >.output
+cat >.expected <<EOF
+path0
+path1
+path2/file2
+EOF
+
+test_expect_success 'diff .output .expected'
+test_done
------------------------------------------------
Compilation finished at Thu May 12 00:43:56
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2005-05-12 7:42 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-05-12 7:48 [PATCH] Support symlinks in git-ls-files --others Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).