That’s a good point. I did not think of such corner cases. I will remove that mention then.
> Le 17 déc. 2019 à 06:33, SZEDER Gábor <szeder.dev@xxxxxxxxx> a écrit :
>
> On Tue, Dec 17, 2019 at 05:07:42AM +0000, Philippe Blain via GitGitGadget wrote:
>> From: Philippe Blain <levraiphilippeblain@xxxxxxxxx>
>>
>> Currently the line-log functionality (git log -L) only supports
>> displaying patch output (`-p`, its default behavior) and suppressing it
>> (`-s`). A check was added in the code to that effect in 5314efaea (line-log:
>> detect unsupported formats, 2019-03-10) but the documentation was not
>> updated.
>>
>> Explicitly mention that `-L` implies `-p`, that patch output can be
>> suppressed using `-s`, and that all other diff formats are not allowed.
>>
>> Additionnally, mention that the ':<funcname>' form implies `--function-context`.
>>
>> Signed-off-by: Philippe Blain <levraiphilippeblain@xxxxxxxxx>
>> ---
>> Documentation/git-log.txt | 6 +++++-
>> Documentation/gitk.txt | 6 +++++-
>> 2 files changed, 10 insertions(+), 2 deletions(-)
>>
>> diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
>> index b406bc4c48..1c52bf184d 100644
>> --- a/Documentation/git-log.txt
>> +++ b/Documentation/git-log.txt
>> @@ -77,7 +77,11 @@ produced by `--stat`, etc.
>> not give any pathspec limiters. This is currently limited to
>> a walk starting from a single revision, i.e., you may only
>> give zero or one positive revision arguments.
>> - You can specify this option more than once.
>> + You can specify this option more than once. Implies `--patch`.
>> + If ``:<funcname>'' is given, implies `--function-context`.
>
> ':<funcname>' doesn't imply '--function-context', but defines a line
> range starting at the function-name-looking line that first matches
> "funcname" and ending just before the next function-name-looking line,
> and line-log will then show that line range as context for each
> commit. Although in many cases it shows diffs that look like as if
> '--function-context' were given, there are corner cases where they
> clearly differ, e.g. when following the history of a function that was
> at one point combined with the function directly below it.
>
> Note the two commits in the middle that show two functions although
> only one of them was actually modified in each of those commits:
>
> $ git log --oneline -L:func:file.c
> 04b0c16 Combine funcA() and funcB() into func()
>
> diff --git a/file.c b/file.c
> --- a/file.c
> +++ b/file.c
> @@ -1,9 +1,4 @@
> -int funcA()
> +int func()
> {
> - return A;
> -}
> -
> -int funcB()
> -{
> - return B;
> + return A + B;
> }
> ed0d4d9 Modify funcB()
>
> diff --git a/file.c b/file.c
> --- a/file.c
> +++ b/file.c
> @@ -1,9 +1,9 @@
> int funcA()
> {
> return A;
> }
>
> int funcB()
> {
> - return b;
> + return B;
> }
> 0d4e9b5 Modify funcA()
>
> diff --git a/file.c b/file.c
> --- a/file.c
> +++ b/file.c
> @@ -1,9 +1,9 @@
> int funcA()
> {
> - return a;
> + return A;
> }
>
> int funcB()
> {
> return b;
> }
> c3f8a44 Add funcA() and funcB()
>
> diff --git a/file.c b/file.c
> --- /dev/null
> +++ b/file.c
> @@ -0,0 +1,9 @@
> +int funcA()
> +{
> + return a;
> +}
> +
> +int funcB()
> +{
> + return b;
> +}
>
> Now compare that to the same two middle commits shown with '-p
> --function-context', which doesn't show the unmodified function:
>
> $ git log --oneline -p --function-context file.c
> 04b0c16 Combine funcA() and funcB() into func()
> diff --git a/file.c b/file.c
> index 89571b3..33301ea 100644
> --- a/file.c
> +++ b/file.c
> @@ -1,9 +1,4 @@
> -int funcA()
> +int func()
> {
> - return A;
> -}
> -
> -int funcB()
> -{
> - return B;
> + return A + B;
> }
> ed0d4d9 Modify funcB()
> diff --git a/file.c b/file.c
> index 13592c8..89571b3 100644
> --- a/file.c
> +++ b/file.c
> @@ -5,5 +5,5 @@ int funcA()
>
> int funcB()
> {
> - return b;
> + return B;
> }
> 0d4e9b5 Modify funcA()
> diff --git a/file.c b/file.c
> index 11e1e87..13592c8 100644
> --- a/file.c
> +++ b/file.c
> @@ -1,6 +1,6 @@
> int funcA()
> {
> - return a;
> + return A;
> }
>
> int funcB()
> c3f8a44 Add funcA() and funcB()
> diff --git a/file.c b/file.c
> new file mode 100644
> index 0000000..11e1e87
> --- /dev/null
> +++ b/file.c
> @@ -0,0 +1,9 @@
> +int funcA()
> +{
> + return a;
> +}
> +
> +int funcB()
> +{
> + return b;
> +}
