From: "Grégoire PARIS" <postmaster@greg0ire.fr>
To: <git@vger.kernel.org>
Subject: phpdoc diff in git -L is not the correct one
Date: Sat, 14 Nov 2020 14:19:01 +0100 [thread overview]
Message-ID: <348a2a4a-dfdb-190b-edac-01e9ad4c2d4d@greg0ire.fr> (raw)
[-- 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
next reply other threads:[~2020-11-14 13:26 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-14 13:19 Grégoire PARIS [this message]
2020-11-14 15:32 ` phpdoc diff in git -L is not the correct one 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=348a2a4a-dfdb-190b-edac-01e9ad4c2d4d@greg0ire.fr \
--to=postmaster@greg0ire.fr \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public 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).