log -L: test merge of parallel modify/rename

diff --git a/pathspec.c b/pathspec.c
index 02d33444608ec65d02f45623e1ddf694f61747bd..284f3970a31eb86a121712267e36ff162452590d 100644 (file)
--- a/pathspec.c
+++ b/pathspec.c
@@ -87,3 +87,15 @@ const char *check_path_for_gitlink(const char *path)
        }
        return path;
 }
+
+/*
+ * Dies if the given path refers to a file inside a symlinked
+ * directory in the index.
+ */
+void die_if_path_beyond_symlink(const char *path, const char *prefix)
+{
+       if (has_symlink_leading_path(path, strlen(path))) {
+               int len = prefix ? strlen(prefix) : 0;
+               die(_("'%s' is beyond a symbolic link"), path + len);
+       }
+}