Handle core.symlinks=false case in merge-recursive.

[git.git] / diff-lib.c

diff --git a/diff-lib.c b/diff-lib.c
index 2e916199066db068d80ff5168b3feee6cfba7056..f70888f8af57b3b7a695ecdbc19a3b8bc04c13b2 100644 (file)
--- 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);