From: Joan Aguilar <joan.aguilar.lorente@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Michael J Gruber <git@grubix.eu>, git@vger.kernel.org
Subject: Re: report on a possible bug: git commit -p myfile.py unexpected output
Date: Fri, 24 Mar 2017 16:31:09 +0100 [thread overview]
Message-ID: <CAG+Y4s8WGwmP7uOsNz4GkR3tsaeB2e1qBysrs-4pqLBKYC+Grg@mail.gmail.com> (raw)
In-Reply-To: <20170324150921.vwh4yqpz25ph3zxe@sigill.intra.peff.net>
Hello Michael, hello Jeff,
I was writing a response to Michael and I received the Email from
Jeff, so I decided to reply to the second one, with copy to both of
you (and the mailing list too, of course). I hope this is ok for you.
It works exactly as Jeff said.
If I do git show --stat 96d1c24 the output is:
user@machine:~/mygitrepo$ git show --stat 96d1c24
commit 96d1c24*******
Author: Joan Aguilar Lorente <joan.aguilar.lorente@gmail.com>
Date: Thu Mar 23 18:15:07 2017 +0100
myfile.py -> old unused methods removed...
1) mymethod1
2) mymethod2
3) mymethod3
4) mymethod4
5) mymethod5
myfile.py | 120
------------------------------------------------------------------------------------------------------------------------
1 file changed, 120 deletions(-)
But if I add the flag -B (git show --stat -B 96d1c24) the last two
lines are different (as already expected by Jeff) and match exactly
the output of git commit I got yesterday.
myfile.py | 484
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------
1 file changed, 182 insertions(+), 302 deletions(-)
The output of git show -B is, of course, like the one expected by Jeff too.
Thank you! I learned a little bit about git. And most of all, I
realize there are a lot of options and flags I am not aware of, and
not using at all! I have to read the documentation. I am missing a lot
of git!!
I am sorry that I reported this as possible bug. I guess I was just
confused because the "standard behavior" of "git commit" differs from
the one of "tig" or "git show".
Thank you again and I see you around.
Best regards
Joan Aguilar Lorente
--
Joan Aguilar Lorente
On Fri, Mar 24, 2017 at 4:09 PM, Jeff King <peff@peff.net> wrote:
> On Fri, Mar 24, 2017 at 03:59:07PM +0100, Michael J Gruber wrote:
>
>> > [master 96d1c24] myfile.py -> old unused methods removed...
>> > 1 file changed, 182 insertions(+), 302 deletions(-)
>> > rewrite myfile.py (60%)
>> [...]
>> > myfile.py | 120
>> > ---------------------------------------------------------------------------------------------------------------------
>> > 1 file changed, 120 deletions(-)
>>
>> 182-302 = -120
>>
>> Did you make any changes in the lines that you left? Apparantly, that's
>> what the rewrite looked like to git commit.
>
> Even without changes to the remaining lines, a rewrite diff would
> consider them removed from the preimage and added again in the
> post-image.
>
> The difference between the two commands is that "commit" turns on "-B"
> break detection by default, and "git show", "tig", etc, do not.
>
> Looking at the actual diff with "git show -B" should show something
> like:
>
> -old
> -lines
> -that
> -weren't
> -touched
> -some
> -lines
> -that
> -were
> -deleted
> +old
> +lines
> +that
> +weren't
> +touched
>
> The change is the same no matter how you view it; the "-B" flag just
> asks Git to show a non-minimal diff when the file was substantially
> changed.
>
> -Peff
next prev parent reply other threads:[~2017-03-24 15:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-24 10:27 report on a possible bug: git commit -p myfile.py unexpected output Joan Aguilar
2017-03-24 14:59 ` Michael J Gruber
2017-03-24 15:09 ` Jeff King
2017-03-24 15:31 ` Joan Aguilar [this message]
2017-03-24 15:52 ` Jeff King
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=CAG+Y4s8WGwmP7uOsNz4GkR3tsaeB2e1qBysrs-4pqLBKYC+Grg@mail.gmail.com \
--to=joan.aguilar.lorente@gmail.com \
--cc=git@grubix.eu \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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).