git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* phpdoc diff in git -L is not the correct one
@ 2020-11-14 13:19 Grégoire PARIS
  2020-11-14 15:32 ` Martin Ågren
  0 siblings, 1 reply; 7+ messages in thread
From: Grégoire PARIS @ 2020-11-14 13:19 UTC (permalink / raw)
  To: git

[-- Attachment #1: Type: text/plain, Size: 411 bytes --]

Hello,

I have recently found out about git -L , which is great! I think I have 
found a
bug in it though: the diff is correct on the method itself, but changes 
in the
phpdoc of the method do not seem to be taken into account, while changes 
in the
phpdoc of the method that follows the one I care about show up in the 
diff. I
have attached a bug report generated with git bugreport.

Regards,

-- 
greg0ire


[-- Attachment #2: git-bugreport-2020-11-14-1402.txt --]
[-- Type: text/plain, Size: 1489 bytes --]

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)

echo '*.php diff=php' > ~/.config/git/attributes
git clone git@github.com:doctrine/instantiator.git
cd instantiator
git log -L :instantiate:src/Doctrine/Instantiator/Instantiator.php

What did you expect to happen? (Expected behavior)

See changes that happened in the phpdoc of the instantiate() method appear in
the log.

What happened instead? (Actual behavior)

I saw changes that happened in the phpdoc of the buildAndCacheFromFactory()
method, which is the one right after the instantiate() method

What's different between what you expected and what actually happened?

The phpdoc being diffed.

Anything else you want to add:

Showing changes of the phpdoc of the method might not be easy to implement, but
I think not showing changes of the phpdoc of the next method should be.

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.28.0
cpu: x86_64
no commit associated with this build
sizeof-long: 8
sizeof-size_t: 8
shell-path: /bin/sh
uname: Linux 5.8.16-300.fc33.x86_64 #1 SMP Mon Oct 19 13:18:33 UTC 2020 x86_64
compiler info: gnuc: 10.2
libc info: glibc: 2.32
$SHELL (typically, interactive shell): /bin/zsh


[Enabled Hooks]
pre-commit
post-commit
post-checkout
post-merge
pre-push
post-rewrite

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2020-11-18 19:23 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-14 13:19 phpdoc diff in git -L is not the correct one Grégoire PARIS
2020-11-14 15:32 ` Martin Ågren
2020-11-14 15:55   ` Grégoire PARIS
2020-11-14 17:35     ` Martin Ågren
2020-11-14 23:40       ` René Scharfe
2020-11-18  8:17         ` Grégoire PARIS
2020-11-18 19:18           ` Martin Ågren

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).