summaryrefslogtreecommitdiff
path: root/entry.c
diff options
context:
space:
mode:
authorMartin Waitz <tali@admingilde.org>2007-05-21 22:08:28 +0200
committerJunio C Hamano <junkio@cox.net>2007-05-21 23:34:54 -0700
commit302b9282c9ddfcc704ca759bdc98c1d5f75eba2f (patch)
treec89135b54e9bcab4e58a70b245c8dde4ddf2020f /entry.c
parentfbf5df024e9137d446c5a85adeae7e4780365d1b (diff)
downloadgit-302b9282c9ddfcc704ca759bdc98c1d5f75eba2f.tar.gz
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 'entry.c')
-rw-r--r--entry.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/entry.c b/entry.c
index 82bf7259a7..ae6476496a 100644
--- a/entry.c
+++ b/entry.c
@@ -145,7 +145,7 @@ static int write_entry(struct cache_entry *ce, char *path, const struct checkout
"symlink %s (%s)", path, strerror(errno));
}
break;
- case S_IFDIRLNK:
+ case S_IFGITLINK:
if (to_tempfile)
return error("git-checkout-index: cannot create temporary subproject %s", path);
if (mkdir(path, 0777) < 0)
@@ -194,7 +194,7 @@ int checkout_entry(struct cache_entry *ce, const struct checkout *state, char *t
unlink(path);
if (S_ISDIR(st.st_mode)) {
/* If it is a gitlink, leave it alone! */
- if (S_ISDIRLNK(ntohl(ce->ce_mode)))
+ if (S_ISGITLINK(ntohl(ce->ce_mode)))
return 0;
if (!state->force)
return error("%s is a directory", path);