summaryrefslogtreecommitdiff
path: root/dir.c
diff options
context:
space:
mode:
authorMartin Waitz <tali@admingilde.org>2007-05-21 20:08:28 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-05-22 06:34:54 (GMT)
commit302b9282c9ddfcc704ca759bdc98c1d5f75eba2f (patch)
treec89135b54e9bcab4e58a70b245c8dde4ddf2020f /dir.c
parentfbf5df024e9137d446c5a85adeae7e4780365d1b (diff)
downloadgit-302b9282c9ddfcc704ca759bdc98c1d5f75eba2f.zip
git-302b9282c9ddfcc704ca759bdc98c1d5f75eba2f.tar.gz
git-302b9282c9ddfcc704ca759bdc98c1d5f75eba2f.tar.bz2
rename dirlink to gitlink.
Unify naming of plumbing dirlink/gitlink concept: git ls-files -z '*.[ch]' | xargs -0 perl -pi -e 's/dirlink/gitlink/g;' -e 's/DIRLNK/GITLINK/g;' Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'dir.c')
-rw-r--r--dir.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/dir.c b/dir.c
index 11fab7f..f543f50 100644
--- a/dir.c
+++ b/dir.c
@@ -321,7 +321,7 @@ static enum exist_status directory_exists_in_index(const char *dirname, int len)
break;
if (endchar == '/')
return index_directory;
- if (!endchar && S_ISDIRLNK(ntohl(ce->ce_mode)))
+ if (!endchar && S_ISGITLINK(ntohl(ce->ce_mode)))
return index_gitdir;
}
return index_nonexistent;
@@ -356,7 +356,7 @@ static enum exist_status directory_exists_in_index(const char *dirname, int len)
* also true and the directory is empty, in which case
* we just ignore it entirely.
* (b) if it looks like a git directory, and we don't have
- * 'no_dirlinks' set we treat it as a gitlink, and show it
+ * 'no_gitlinks' set we treat it as a gitlink, and show it
* as a directory.
* (c) otherwise, we recurse into it.
*/
@@ -383,7 +383,7 @@ static enum directory_treatment treat_directory(struct dir_struct *dir,
case index_nonexistent:
if (dir->show_other_directories)
break;
- if (!dir->no_dirlinks) {
+ if (!dir->no_gitlinks) {
unsigned char sha1[20];
if (resolve_gitlink_ref(dirname, "HEAD", sha1) == 0)
return show_directory;