Blame

Date:
Message:
back out "improve accuracy of function prototype in hunk headers" which was commit 8993f42562696079866fc2dec7191877b6cc1f18 This commit introduced a regression where hunk headers would contain lines taken from below or within a change. Reported by tb@ and sthen@. There is some confusion around how the -p feature was documented: -p With unified and context diffs, show with each change the first 40 characters of the last line before the context beginning with a letter, an underscore or a dollar sign. For C source code following standard layout conventions, this will show the prototype of the function the change applies to. The original behaviour matches "the last line before the context beginning with a letter ...". The new (reverted) behaviour sometimes matches "will show the prototype of the function the change applies to". This did always happen as intended, as seen when some .c files in the OpenBSD src tree were changed. The new behaviour was also worse for Makefiles in the OpenBSD ports tree. Let's revert to the traditional -p behaviour until a better fix is found. Details: https://marc.gameoftrees.org/mail/1692696001.69872_0.html https://marc.info/?l=gameoftrees&m=169269624516330&w=2 ok tb@
Actions:
History | Blob | Raw File
1 e1595dc1 2022-09-23 mark --- test124.left-p.txt

2 e1595dc1 2022-09-23 mark +++ test124.right-p.txt

3 dc306c6b 2023-08-29 stsp @@ -11,5 +11,5 @@ doSomethingThenPrintHello(int test)

4 e1595dc1 2022-09-23 mark  

5 e1595dc1 2022-09-23 mark  struct testfile *

6 e1595dc1 2022-09-23 mark  return_test(int test) {

7 e1595dc1 2022-09-23 mark -	return NULL;

8 e1595dc1 2022-09-23 mark +	return test*2;

9 e1595dc1 2022-09-23 mark  }