Anonymous avatar Anonymous committed ec0603e

Teach read-tree 2-way merge to ignore intermediate symlinks

Earlier in 16a4c61, we taught "read-tree -m -u" not to be
confused when switching from a branch that has a path frotz/filfre
to another branch that has a symlink frotz that points at xyzzy/
directory. The fix was incomplete in that it was still confused
when coming back (i.e. switching from a branch with frotz -> xyzzy/
to another branch with frotz/filfre).

This fix is rather expensive in that for a path that is created
we would need to see if any of the leading component of that
path exists as a symbolic link in the filesystem (in which case,
we know that path itself does not exist, and the fact we already
decided to check it out tells us that in the index we already
know that symbolic link is going away as there is no D/F

Signed-off-by: Junio C Hamano <>;

Comments (0)

Files changed (2)


+# Copyright (c) 2007 Junio C Hamano
+test_description='git checkout to switch between branches with symlink<->dir'
+. ./
+test_expect_success setup '
+	mkdir frotz &&
+	echo hello >frotz/filfre &&
+	git add frotz/filfre &&
+	test_tick &&
+	git commit -m "master has file frotz/filfre" &&
+	git branch side &&
+	echo goodbye >nitfol &&
+	git add nitfol
+	test_tick &&
+	git commit -m "master adds file nitfol" &&
+	git checkout side &&
+	git rm --cached frotz/filfre &&
+	mv frotz xyzzy &&
+	ln -s xyzzy frotz &&
+	git add xyzzy/filfre frotz &&
+	test_tick &&
+	git commit -m "side moves frotz/ to xyzzy/ and adds frotz->xyzzy/"
+test_expect_success 'switch from symlink to dir' '
+	git checkout master
+rm -fr frotz xyzzy nitfol &&
+git checkout -f master || exit
+test_expect_success 'switch from dir to symlink' '
+	git checkout side
 	if (o->index_only || o->reset || !o->update)
+	if (has_symlink_leading_path(path, NULL))
+		return;
 	if (!lstat(path, &st)) {
 		int cnt;
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.