From: Johannes Sixt <j.sixt@viscovery•net>
To: Misha Penkov <misha.penkov@gmail•com>, git@vger•kernel.org
Subject: Re: Potential bug: truncated diff output
Date: Thu, 16 Jan 2014 07:55:00 +0100 [thread overview]
Message-ID: <52D78244.7020406@viscovery.net> (raw)
In-Reply-To: <CAAyYaWo7wtsVGGxUeE3wwG6UHZ_qc8wcPu4Dk6=DsF8JtyF6_w@mail.gmail.com>
Am 1/16/2014 7:19, schrieb Misha Penkov:
> I have a file in a git repo. It has changed during the last two
> commits. I want to see the changes made in these two commits. The
> following command should work:
>
> git diff HEAD^^
>
> but that doesn't get me the expected results. Read on for details.
>
> Last commit: I changed some stuff towards the end of the file, for
> example, around line 3145. Here's the full diff (it's here for
> reference, don't bother reading all of it):
>
> $git diff HEAD^ HEAD ieicej.cls
> diff --git a/ieicej.cls b/ieicej.cls
> index ecf8beb..01debd9 100644
> ...
> @@ -3145,11 +3145,11 @@
> \kern 2.715\p@}
>
> \def\@makefnmark{\hbox{$^{\mbox{\tiny \kern-.5zw
> - （注\kern.1zw\@thefnmark{}）\kern-.5zw}}$}}
> + （\kern.1zw\@thefnmark{}）\kern-.5zw}}$}}
>
> \newcommand\@makefntext[1]{\parindent1zw
> \noindent\hbox{\kern-.5zw
> - （注\kern.1zw\@thefnmark{}）\kern-.5zw\hbox to 1zw{\hss ：\hss}}#1}
> + （\kern.1zw\@thefnmark{}）\kern-.5zw\hbox to 1zw{\hss ：\hss}}#1}
>
> \def\thefootnote{\@arabic\c@footnote}
> \def\thempfootnote{\@fnsymbol\c@mpfootnote}
Here, you revert the change...
> Here's the second-last commit. I changed some things around line 1714.
> Full commit diff (again, for reference only):
>
> $git diff -p HEAD^^ HEAD^ ieicej.cls
> diff --git a/ieicej.cls b/ieicej.cls
> index 1c3b947..ecf8beb 100644
> ...
> @@ -3135,11 +3145,11 @@
> \kern 2.715\p@}
>
> \def\@makefnmark{\hbox{$^{\mbox{\tiny \kern-.5zw
> - （\kern.1zw\@thefnmark{}）\kern-.5zw}}$}}
> + （注\kern.1zw\@thefnmark{}）\kern-.5zw}}$}}
>
> \newcommand\@makefntext[1]{\parindent1zw
> \noindent\hbox{\kern-.5zw
> - （\kern.1zw\@thefnmark{}）\kern-.5zw\hbox to 1zw{\hss ：\hss}}#1}
> + （注\kern.1zw\@thefnmark{}）\kern-.5zw\hbox to 1zw{\hss ：\hss}}#1}
>
> \def\thefootnote{\@arabic\c@footnote}
> \def\thempfootnote{\@fnsymbol\c@mpfootnote}
... that you made here.
Unsurprisingly, the net effect is no change in that area -- and git diff
tells you exactly that.
-- Hannes
next prev parent reply other threads:[~2014-01-16 6:55 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-16 6:19 Potential bug: truncated diff output Misha Penkov
2014-01-16 6:31 ` David Kastrup
2014-01-16 6:55 ` Johannes Sixt [this message]
2014-01-16 7:04 ` David Kastrup
2014-01-16 7:06 ` Misha Penkov
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=52D78244.7020406@viscovery.net \
--to=j.sixt@viscovery$(echo .)net \
--cc=git@vger$(echo .)kernel.org \
--cc=misha.penkov@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox