summaryrefslogtreecommitdiff
path: root/lockfile.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-07-25 23:22:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-07-25 23:22:55 (GMT)
commitd58e8d34b019d435b424811c6f972910dfac6f55 (patch)
treee36d2949e7dade4dca78fc6c70c5e9519ca8c741 /lockfile.c
parent1a44be9a0ff6fa623ff6061992f5ad1831dc7cab (diff)
downloadgit-d58e8d34b019d435b424811c6f972910dfac6f55.zip
git-d58e8d34b019d435b424811c6f972910dfac6f55.tar.gz
git-d58e8d34b019d435b424811c6f972910dfac6f55.tar.bz2
When locking in a symlinked repository, try to lock the original.
In a working tree prepared in new-workdir (in contrib/), some files in .git/ directory are symbolic links to the original repository. The usual sequence of lock-write-rename would break the symbolic link. Ideally we should resolve relative symbolic link with maxdepth, but I do not want to risk too elaborate patch before 1.5.3 release, so this is a minimum and trivially obvious fix. new-workdir creates its symbolic links absolute, and does not link from a symlinked workdir, so this fix should suffice for now. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'lockfile.c')
-rw-r--r--lockfile.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/lockfile.c b/lockfile.c
index fb8f13b..9202472 100644
--- a/lockfile.c
+++ b/lockfile.c
@@ -28,6 +28,19 @@ static void remove_lock_file_on_signal(int signo)
static int lock_file(struct lock_file *lk, const char *path)
{
int fd;
+ struct stat st;
+
+ if ((!lstat(path, &st)) && S_ISLNK(st.st_mode)) {
+ ssize_t sz;
+ static char target[PATH_MAX];
+ sz = readlink(path, target, sizeof(target));
+ if (sz < 0)
+ warning("Cannot readlink %s", path);
+ else if (target[0] != '/')
+ warning("Cannot lock target of relative symlink %s", path);
+ else
+ path = target;
+ }
sprintf(lk->filename, "%s.lock", path);
fd = open(lk->filename, O_RDWR | O_CREAT | O_EXCL, 0666);
if (0 <= fd) {