diff options
| author | Martin Waitz <tali@admingilde.org> | 2007-05-21 22:08:28 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-21 23:34:54 -0700 |
| commit | 302b9282c9ddfcc704ca759bdc98c1d5f75eba2f (patch) | |
| tree | c89135b54e9bcab4e58a70b245c8dde4ddf2020f /read-cache.c | |
| parent | fbf5df024e9137d446c5a85adeae7e4780365d1b (diff) | |
| download | git-302b9282c9ddfcc704ca759bdc98c1d5f75eba2f.tar.gz git-302b9282c9ddfcc704ca759bdc98c1d5f75eba2f.tar.xz | |
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 'read-cache.c')
| -rw-r--r-- | read-cache.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/read-cache.c b/read-cache.c index d9f46da5c..ad4e18753 100644 --- a/read-cache.c +++ b/read-cache.c @@ -92,7 +92,7 @@ static int ce_compare_gitlink(struct cache_entry *ce) /* * We don't actually require that the .git directory - * under DIRLNK directory be a valid git directory. It + * under GITLINK directory be a valid git directory. It * might even be missing (in case nobody populated that * sub-project). * @@ -115,7 +115,7 @@ static int ce_modified_check_fs(struct cache_entry *ce, struct stat *st) return DATA_CHANGED; break; case S_IFDIR: - if (S_ISDIRLNK(ntohl(ce->ce_mode))) + if (S_ISGITLINK(ntohl(ce->ce_mode))) return 0; default: return TYPE_CHANGED; @@ -142,7 +142,7 @@ static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st) (has_symlinks || !S_ISREG(st->st_mode))) changed |= TYPE_CHANGED; break; - case S_IFDIRLNK: + case S_IFGITLINK: if (!S_ISDIR(st->st_mode)) changed |= TYPE_CHANGED; else if (ce_compare_gitlink(ce)) |