diff options
| author | Martin Waitz <tali@admingilde.org> | 2007-05-21 20:08:28 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-22 06:34:54 (GMT) |
| commit | 302b9282c9ddfcc704ca759bdc98c1d5f75eba2f (patch) | |
| tree | c89135b54e9bcab4e58a70b245c8dde4ddf2020f /builtin-update-index.c | |
| parent | fbf5df024e9137d446c5a85adeae7e4780365d1b (diff) | |
| download | git-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 'builtin-update-index.c')
| -rw-r--r-- | builtin-update-index.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-update-index.c b/builtin-update-index.c index 8f98991..509369e 100644 --- a/builtin-update-index.c +++ b/builtin-update-index.c @@ -134,7 +134,7 @@ static int process_directory(const char *path, int len, struct stat *st) /* Exact match: file or existing gitlink */ if (pos >= 0) { struct cache_entry *ce = active_cache[pos]; - if (S_ISDIRLNK(ntohl(ce->ce_mode))) { + if (S_ISGITLINK(ntohl(ce->ce_mode))) { /* Do nothing to the index if there is no HEAD! */ if (resolve_gitlink_ref(path, "HEAD", sha1) < 0) @@ -178,7 +178,7 @@ static int process_file(const char *path, int len, struct stat *st) int pos = cache_name_pos(path, len); struct cache_entry *ce = pos < 0 ? NULL : active_cache[pos]; - if (ce && S_ISDIRLNK(ntohl(ce->ce_mode))) + if (ce && S_ISGITLINK(ntohl(ce->ce_mode))) return error("%s is already a gitlink, not replacing", path); return add_one_path(ce, path, len, st); |