threads / discuss / 66834

git context diff does not recognize shell function name

Subject: git context diff does not recognize shell function name

## tl;dr

A user on Git 2.51.0 saw no function name in context lines; Johannes Sixt explained that no diff driver is enabled by default. Read the story.

replies: 3people: 3as markdown or json

Windl, Ulrich· Nov 12, 2026, 13:39 UTC · lore
Hi!

In git 2.51.0 I found a minor issue: "git diff" did not show the corresponding shell function name. Admittedly I used a somewhat uncommon line-breaking:

The context in question looks like this:
---
...
run_query()
{
    local p_l_0="$1" LOG_BASE="$2" SUFFIX="$3" URL_BASE="$4" URL="$5" \
_COUNT="${6:-$COUNT}" RESPONSE_CHECKER="$7"
    local me="${FUNCNAME[0]}" m
...
---

The context diff looked like this: --- ...

@@ -193,6 +188,36 @@ get_params()
... 
run_query()
 {
@@ -201,10 +226,9 @@ _COUNT="${6:-$COUNT}" RESPONSE_CHECKER="$7"
     local me="${FUNCNAME[0]}" m
...
---
("..." is deleted lines)
So this may be a combination of unfortunate context sequencing and the first line of the new context being unusual.
The second chunk would still be the same context, namely "run_query()".

Kind regards,
Ulrich Windl
Junio C Hamano· Nov 12, 2026, 20:51 UTC · re: Windl, Ulrich · lore

Re: git context diff does not recognize shell function name

"Windl, Ulrich" <u.windl@ukr.de> writes:
> Hi!
>
> In git 2.51.0 I found a minor issue:

That is a release from more than a year ago, but I do not think we had any change to userdiff (i.e., built-in patterns that define what line is the function header for various languages) since then (we added Swift and tweaked scheme). So for practical purposes, I would expect that whatever you saw in Git 2.51 for shell to be reproducible in today's code.

Or are you reporting that Git 2.50 (or something older than 2.51) behaved in a way you prefer, and 2.51 behaves differently?

Show 21 quoted lines
> "git diff" did not show the corresponding shell function
> name. Admittedly I used a somewhat uncommon line-breaking:
>
> The context in question looks like this:
> ---
> ...
> run_query()
> {
>     local p_l_0="$1" LOG_BASE="$2" SUFFIX="$3" URL_BASE="$4" URL="$5" \
> _COUNT="${6:-$COUNT}" RESPONSE_CHECKER="$7"
>     local me="${FUNCNAME[0]}" m
> ...
> ---
>
> The context diff looked like this:
> ---
> ...
> @@ -193,6 +188,36 @@ get_params()
> ... 
> run_query()
>  {

I assume that your e-mail message is whitespace damaged and run_query() is actually indented by one space, being a context line together with the opening brace next line? The header stating get_params() is expected, as the "function name" do not lookahead to find run_query() in the hunk it is going to show.

> @@ -201,10 +226,9 @@ _COUNT="${6:-$COUNT}" RESPONSE_CHECKER="$7"

It is not that the line that begins run_query()'s definition does not look like a beginning of a function. It is that this _COUNT= line does look like a beginning of a new thing, and because it comes after the start of run_query().

The name of the file would affect which set of regular expressions are used to sift lines into function headers and other lines. When the file has no known suffix with language specific rules defined, I think we just pick any line that begins with a non-whitespace character, which explains why the line that begins with _COUNT=... overrides the line that begins with run_query() which would have been a candidate as another and later candidate.

Show 7 quoted lines
>      local me="${FUNCNAME[0]}" m
> ...
> ---
> ("..." is deleted lines)
> So this may be a combination of unfortunate context sequencing and
> the first line of the new context being unusual.  The second chunk
> would still be the same context, namely "run_query()".
Windl, Ulrich· Nov 13, 2026, 07:09 UTC · re: Junio C Hamano · lore

RE: [EXT] Re: git context diff does not recognize shell function name

Hi!

Thanks for the comments. I have to use Outlook (Classic), so I cannot do much about the bugs it has, sorry for both of us. The file name ends in ".sh", and there's also a "she-bang" at the start saying it's a BASH script.

For "_COUNT="${6:-$COUNT}" RESPONSE_CHECKER="$7"" looking like the start of a function: I think the essential thing is that the line before ends with a backslash, so it's rather unlikely that this line starts any new definition.

Kind regards, Ulrich Windl

Show 80 quoted lines
> -----Original Message-----
> From: Junio C Hamano <gitster@pobox.com>
> Sent: Thursday, November 12, 2026 9:51 PM
> To: Windl, Ulrich <u.windl@ukr.de>
> Cc: git@vger.kernel.org
> Subject: [EXT] Re: git context diff does not recognize shell function name
> 
> Sicherheits-Hinweis: Diese E-Mail wurde von einer Person außerhalb des UKR
> gesendet. Seien Sie vorsichtig vor gefälschten Absendern, wenn Sie auf Links
> klicken, Anhänge öffnen oder weitere Aktionen ausführen, bevor Sie die
> Echtheit überprüft haben.
> 
> "Windl, Ulrich" <u.windl@ukr.de> writes:
> 
> > Hi!
> >
> > In git 2.51.0 I found a minor issue:
> 
> That is a release from more than a year ago, but I do not think we
> had any change to userdiff (i.e., built-in patterns that define what
> line is the function header for various languages) since then (we
> added Swift and tweaked scheme).  So for practical purposes, I would
> expect that whatever you saw in Git 2.51 for shell to be reproducible
> in today's code.
> 
> Or are you reporting that Git 2.50 (or something older than 2.51)
> behaved in a way you prefer, and 2.51 behaves differently?
> 
> > "git diff" did not show the corresponding shell function
> > name. Admittedly I used a somewhat uncommon line-breaking:
> >
> > The context in question looks like this:
> > ---
> > ...
> > run_query()
> > {
> >     local p_l_0="$1" LOG_BASE="$2" SUFFIX="$3" URL_BASE="$4" URL="$5"
> \
> > _COUNT="${6:-$COUNT}" RESPONSE_CHECKER="$7"
> >     local me="${FUNCNAME[0]}" m
> > ...
> > ---
> >
> > The context diff looked like this:
> > ---
> > ...
> > @@ -193,6 +188,36 @@ get_params()
> > ...
> > run_query()
> >  {
> 
> I assume that your e-mail message is whitespace damaged and
> run_query() is actually indented by one space, being a context line
> together with the opening brace next line?  The header stating
> get_params() is expected, as the "function name" do not lookahead to
> find run_query() in the hunk it is going to show.
> 
> > @@ -201,10 +226,9 @@ _COUNT="${6:-$COUNT}"
> RESPONSE_CHECKER="$7"
> 
> It is not that the line that begins run_query()'s definition does
> not look like a beginning of a function.  It is that this _COUNT=
> line does look like a beginning of a new thing, and because it comes
> after the start of run_query().
> 
> The name of the file would affect which set of regular expressions
> are used to sift lines into function headers and other lines.  When
> the file has no known suffix with language specific rules defined, I
> think we just pick any line that begins with a non-whitespace
> character, which explains why the line that begins with
> _COUNT=... overrides the line that begins with run_query() which
> would have been a candidate as another and later candidate.
> 
> >      local me="${FUNCNAME[0]}" m
> > ...
> > ---
> > ("..." is deleted lines)
> > So this may be a combination of unfortunate context sequencing and
> > the first line of the new context being unusual.  The second chunk
> > would still be the same context, namely "run_query()".
Johannes Sixt· Nov 14, 2026, 08:49 UTC · re: Windl, Ulrich · lore

Re: [EXT] Re: git context diff does not recognize shell function name

Am 13.11.26 um 08:09 schrieb Windl, Ulrich:
> The file
> name ends in ".sh", and there's also a "she-bang" at the start
> saying it's a BASH script.

Git does not activate diff drivers automatically for any type of file (AFAIR), so all of these properties are ignored. You have to activate the diff driver yourself, for example, by putting a line like

*.sh diff=bash

in your .git/info/attributes or a .gitattributes. Without this, the default hunk header pattern is used, which picks up lines that begin with a non-punctuation character.

-- Hannes

← back to recent threads