git grep bug replacing - with :

git grep bug replacing - with :

[Rickard Andersson]

Thank you for filling out a Git bug report!
Please answer the following questions to help us understand your issue.

What did you do before the bug happened? (Steps to reproduce your issue)
   Added 2 files to my repo with words in them
   text-file.txt
   text-file-file.txt

   I did a git grep for said words that exists in both, and used
argument `-l` to only
   show matching filename
   ```
   git grep -l ExtremelyInterestingWord
   ```

What did you expect to happen? (Expected behavior)
   I expected to get the following output
   ```
   text-file.txt
   text-file-file.txt
   ```

What happened instead? (Actual behavior)
   I get
   ```
   text:file.txt
   text:file-file.txt
   ```


What's different between what you expected and what actually happened?
   It seems that when using the argument `-l` the first `-` in a filename is
   replaced with a `:`. It also seems that it is just the first one as the
   second file keeps it's second occurence of `-`.

Anything else you want to add:

Please review the rest of the bug report below.
You can delete any lines you don't wish to share.

[System Info]
git version:
git version 2.34.1
cpu: x86_64
no commit associated with this build
sizeof-long: 8
sizeof-size_t: 8
shell-path: /bin/sh
uname: Linux 6.5.0-35-generic #35~22.04.1-Ubuntu SMP PREEMPT_DYNAMIC
Tue May  7 09:00:52 UTC 2 x86_64
compiler info: gnuc: 11.4
libc info: glibc: 2.35
$SHELL (typically, interactive shell): /usr/bin/zsh

Re: git grep bug replacing - with :

[Eric Sunshine]

On Fri, Jun 14, 2024 at 3:22 PM Rickard Andersson
<rickard.a1992@gmail.com> wrote:
> What did you do before the bug happened? (Steps to reproduce your issue)
>    Added 2 files to my repo with words in them
>    text-file.txt
>    text-file-file.txt
>    ```
>    git grep -l ExtremelyInterestingWord
>    ```
>
> What happened instead? (Actual behavior)
>    I get
>    ```
>    text:file.txt
>    text:file-file.txt
>    ```

I am unable to reproduce this problem:

    $ git version
    git version 2.45.2
    $ git init foo
    Initialized empty Git repository in .../foo/.git/
    $ cd foo
    $ echo ExtremelyInterestingWord >text-file.txt
    $ echo ExtremelyInterestingWord >text-file-file.txt
    $ git add text-file.txt text-file-file.txt
    $ git commit -m msg
    [main (root-commit) 765269f] msg
     2 files changed, 2 insertions(+)
     create mode 100644 text-file-file.txt
     create mode 100644 text-file.txt
    $ git grep -l ExtremelyInterestingWord
    text-file-file.txt
    text-file.txt

Re: git grep bug replacing - with :

[Junio C Hamano]

Eric Sunshine <sunshine@sunshineco.com> writes:

> On Fri, Jun 14, 2024 at 3:22 PM Rickard Andersson
> <rickard.a1992@gmail.com> wrote:
>> What did you do before the bug happened? (Steps to reproduce your issue)
>>    Added 2 files to my repo with words in them
>>    text-file.txt
>>    text-file-file.txt
>>    ```
>>    git grep -l ExtremelyInterestingWord
>>    ```
>>
>> What happened instead? (Actual behavior)
>>    I get
>>    ```
>>    text:file.txt
>>    text:file-file.txt
>>    ```

If the command line were "git grep -l <pattern> text", and there is
a branch whose name is "text", and in the top level tree of that
"text" branch's commit there are file.txt and file-file.txt both of
which have the pattern, the symptom observed may appear.

But ...

> I am unable to reproduce this problem:
>
>     $ git version
>     git version 2.45.2
>     $ git init foo
>     Initialized empty Git repository in .../foo/.git/
>     $ cd foo
>     $ echo ExtremelyInterestingWord >text-file.txt
>     $ echo ExtremelyInterestingWord >text-file-file.txt
>     $ git add text-file.txt text-file-file.txt
>     $ git commit -m msg
>     [main (root-commit) 765269f] msg
>      2 files changed, 2 insertions(+)
>      create mode 100644 text-file-file.txt
>      create mode 100644 text-file.txt
>     $ git grep -l ExtremelyInterestingWord
>     text-file-file.txt
>     text-file.txt

... with your (i.e. Eric's) reproduction setup, which agrees with
the way how I interpreted the problem description in the original
report, I do not see there is any other possible output from it.

Thanks.

Re: git grep bug replacing - with :

[Rickard Andersson]

Hello,

Kudos for the very quick response times, nice!

I tried to reproduce this in a more isolated way and did Eric's setup
where the issue was reproduced again. However, I realized I should
test this without my gitconfig and could then isolate the issue to the
pager delta. I then noticed the issue is reported there already:
https://github.com/dandavison/delta/issues/1674.

So this is clearly not an issue in git, I should have tried without my
gitconfig before even sending this bugreport so I hope I didn't
take too much of your time.

Best regards,
Rickard

On Fri, 14 Jun 2024 at 23:05, Junio C Hamano <gitster@pobox.com> wrote:
>
> Eric Sunshine <sunshine@sunshineco.com> writes:
>
> > On Fri, Jun 14, 2024 at 3:22 PM Rickard Andersson
> > <rickard.a1992@gmail.com> wrote:
> >> What did you do before the bug happened? (Steps to reproduce your issue)
> >>    Added 2 files to my repo with words in them
> >>    text-file.txt
> >>    text-file-file.txt
> >>    ```
> >>    git grep -l ExtremelyInterestingWord
> >>    ```
> >>
> >> What happened instead? (Actual behavior)
> >>    I get
> >>    ```
> >>    text:file.txt
> >>    text:file-file.txt
> >>    ```
>
> If the command line were "git grep -l <pattern> text", and there is
> a branch whose name is "text", and in the top level tree of that
> "text" branch's commit there are file.txt and file-file.txt both of
> which have the pattern, the symptom observed may appear.
>
> But ...
>
> > I am unable to reproduce this problem:
> >
> >     $ git version
> >     git version 2.45.2
> >     $ git init foo
> >     Initialized empty Git repository in .../foo/.git/
> >     $ cd foo
> >     $ echo ExtremelyInterestingWord >text-file.txt
> >     $ echo ExtremelyInterestingWord >text-file-file.txt
> >     $ git add text-file.txt text-file-file.txt
> >     $ git commit -m msg
> >     [main (root-commit) 765269f] msg
> >      2 files changed, 2 insertions(+)
> >      create mode 100644 text-file-file.txt
> >      create mode 100644 text-file.txt
> >     $ git grep -l ExtremelyInterestingWord
> >     text-file-file.txt
> >     text-file.txt
>
> ... with your (i.e. Eric's) reproduction setup, which agrees with
> the way how I interpreted the problem description in the original
> report, I do not see there is any other possible output from it.
>
> Thanks.

Re: git grep bug replacing - with :

[Eric Sunshine]

On Sat, Jun 15, 2024 at 6:22 AM Rickard Andersson
<rickard.a1992@gmail.com> wrote:
> I tried to reproduce this in a more isolated way and did Eric's setup
> where the issue was reproduced again. However, I realized I should
> test this without my gitconfig and could then isolate the issue to the
> pager delta. I then noticed the issue is reported there already:
> https://github.com/dandavison/delta/issues/1674.
>
> So this is clearly not an issue in git, I should have tried without my
> gitconfig before even sending this bugreport so I hope I didn't
> take too much of your time.

The benefit of having posted here is that there is now a record of it
in the Git mail archive, which may benefit the next person who
encounters the issue (if that person searches the archive). Moreover,
those who followed this thread are now better equipped to point future
reporters at the Delta bug report you cited.