diff options
| author | Johannes Sixt <johannes.sixt@telecom.at> | 2007-03-02 22:11:30 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-02 16:58:05 -0800 |
| commit | 78a8d641c14dc2f0a306d787fa1e42d400b3af4d (patch) | |
| tree | f99b516580d660a3049cbd4c17151f2c8b784653 /diff-lib.c | |
| parent | 4808bec6f9b5fe414f0dbc2cc0445f54f28e9e9c (diff) | |
| download | git-78a8d641c14dc2f0a306d787fa1e42d400b3af4d.tar.gz | |
Add core.symlinks to mark filesystems that do not support symbolic links.
Some file systems that can host git repositories and their working copies
do not support symbolic links. But then if the repository contains a symbolic
link, it is impossible to check out the working copy.
This patch enables partial support of symbolic links so that it is possible
to check out a working copy on such a file system. A new flag
core.symlinks (which is true by default) can be set to false to indicate
that the filesystem does not support symbolic links. In this case, symbolic
links that exist in the trees are checked out as small plain files, and
checking in modifications of these files preserve the symlink property in
the database (as long as an entry exists in the index).
Of course, this does not magically make symbolic links work on such defective
file systems; hence, this solution does not help if the working copy relies
on that an entry is a real symbolic link.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff-lib.c')
| -rw-r--r-- | diff-lib.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/diff-lib.c b/diff-lib.c index 2e91619906..f70888f8af 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -346,6 +346,9 @@ int run_diff_files(struct rev_info *revs, int silent_on_removed) S_ISREG(newmode) && S_ISREG(oldmode) && ((newmode ^ oldmode) == 0111)) newmode = oldmode; + else if (!has_symlinks && + S_ISREG(newmode) && S_ISLNK(oldmode)) + newmode = oldmode; diff_change(&revs->diffopt, oldmode, newmode, ce->sha1, (changed ? null_sha1 : ce->sha1), ce->name, NULL); |