Keep a followed diff to the path it names

A followed diff kept every path that started with the requested one,
so following small.c took small.cpp in as well. A path now has to be
the requested one or lie below it, as the pathspec of an unfollowed
diff matches.

1 file changed, 27 insertions, 0 deletions

diff --git a/tests/t0107-diff.sh b/tests/t0107-diff.shindex 2560c42..6caf539 100755--- a/tests/t0107-diff.sh+++ b/tests/t0107-diff.sh@@ -368,6 +368,33 @@ test_expect_success 'a followed file is diffed as the rename alone' ' 	! grep "a/file-1 b/file-1" tmp ' +# A followed path is matched as a pathspec would match it, the file itself or+# whatever lies below it, rather than every path starting with the same+# characters.+test_expect_success 'a followed path takes in no file it only prefixes' '+	mkrepo repos/prefixed 1 &&+	(+		cd repos/prefixed &&+		mkdir small.d &&+		echo c >small.c &&+		echo cpp >small.cpp &&+		echo d >small.d/f &&+		git add . &&+		git commit -m "add the files" &&+		echo C >small.c &&+		echo CPP >small.cpp &&+		echo D >small.d/f &&+		git commit -am "change the files"+	) &&+	cgitrc_repo prefixedrc prefixed enable-follow-links=1 &&+	cgit_ok prefixedrc "url=prefixed/diff/small.c&follow=1" >tmp &&+	grep "diff --git a/small.c b/small.c" tmp &&+	! grep "small.cpp" tmp &&+	cgit_ok prefixedrc "url=prefixed/diff/small.d&follow=1" >tmp &&+	grep "diff --git a/small.d/f b/small.d/f" tmp &&+	! grep "small.c" tmp+'+ test_expect_success 'following with no path limits nothing' ' 	cgit_ok followrc "url=moved/commit/&follow=1" >tmp && 	grep "diff --git a/file-1 b/file-1" tmp &&
diff --git a/tests/t0107-diff.sh b/tests/t0107-diff.sh
index 2560c42..6caf539 100755
--- a/tests/t0107-diff.sh
+++ b/tests/t0107-diff.sh
@@ -368,6 +368,33 @@ test_expect_success 'a followed file is diffed as the rename alone' '
 	! grep "a/file-1 b/file-1" tmp
 '
 
+# A followed path is matched as a pathspec would match it, the file itself or
+# whatever lies below it, rather than every path starting with the same
+# characters.
+test_expect_success 'a followed path takes in no file it only prefixes' '
+	mkrepo repos/prefixed 1 &&
+	(
+		cd repos/prefixed &&
+		mkdir small.d &&
+		echo c >small.c &&
+		echo cpp >small.cpp &&
+		echo d >small.d/f &&
+		git add . &&
+		git commit -m "add the files" &&
+		echo C >small.c &&
+		echo CPP >small.cpp &&
+		echo D >small.d/f &&
+		git commit -am "change the files"
+	) &&
+	cgitrc_repo prefixedrc prefixed enable-follow-links=1 &&
+	cgit_ok prefixedrc "url=prefixed/diff/small.c&follow=1" >tmp &&
+	grep "diff --git a/small.c b/small.c" tmp &&
+	! grep "small.cpp" tmp &&
+	cgit_ok prefixedrc "url=prefixed/diff/small.d&follow=1" >tmp &&
+	grep "diff --git a/small.d/f b/small.d/f" tmp &&
+	! grep "small.c" tmp
+'
+
 test_expect_success 'following with no path limits nothing' '
 	cgit_ok followrc "url=moved/commit/&follow=1" >tmp &&
 	grep "diff --git a/file-1 b/file-1" tmp &&