git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Eugen Konkov <kes-kes@yandex.ru>
To: Git Mailing List <git@vger.kernel.org>
Subject: Re: bad patch created when I use  --ignore-blank-lines option
Date: Fri, 2 Aug 2019 18:52:56 +0300	[thread overview]
Message-ID: <56155941.20190802185256@yandex.ru> (raw)
In-Reply-To: <1543205721.20190802183954@yandex.ru>

Hello Eugen,

sorry, everything is OK. rafasc suggested me what is the problem.
I should use --full-history 


Friday, August 2, 2019, 6:39:54 PM, you wrote:

> Hello Git,

> I add and remove only blank lines at my file:

> $ git log -p t/29-cmd_l.t

> --- a/t/29-cmd_l.t
> +++ b/t/29-cmd_l.t
> @@ -218,7 +218,6 @@ __DATA__
>  @@ list
>  -e:0005  1;    
>  -e:0002    2;
> -
>  -e
>      0: use Devel::DbBatch split(/,/,q{list.conf;b 2;a 2 1;s 2;l .;q});;
>      1: sub t {
> @@ -226,26 +225,26 @@ ab>>2:     2;
>      3: }
>      4:
>     x5: 1;
> +
>  @@ list from first
>  -e:0010  t2();
> -
>  -e
>      0: use Devel::DbBatch split(/,/,q{list.conf;l 0;q});;
>      1: sub t0 {
>     x2:     1;
>      3: }
> +
>  @@ list from last
>  -e:0010  t2();
> -
>  -e
>      14:
>      15:
>      16:
>      17: # Perl implicitly adds one new line after this one
>      18:
> +
>  @@ list middle
>  -e:0010  t2();
> -
>  -e
>     x5:     t0();
>      6: }



> But  when I use --ignore-blank-lines option I see broken patch. I have
> not added '-e' line, but it is displayed as it was added. Notice '+-e'

> $ git log -p --ignore-blank-lines t/29-cmd_l.t

> diff --git a/t/29-cmd_l.t b/t/29-cmd_l.t
> index 4b77279..d7739d2 100755
> --- a/t/29-cmd_l.t
> +++ b/t/29-cmd_l.t
> @@ -219,6 +219,7 @@ __DATA__
>  -e:0005  1;    
>  -e:0002    2;
>  
> +-e
>      0: use Devel::DbBatch split(/,/,q{list.conf;b 2;a 2 1;s 2;l .;q});;
>      1: sub t {
 ab>>>2:     2;
> @@ -228,6 +229,7 @@ ab>>2:     2;
>  @@ list from first
>  -e:0010  t2();
>  
> +-e
>      0: use Devel::DbBatch split(/,/,q{list.conf;l 0;q});;
>      1: sub t0 {
>     x2:     1;
> @@ -235,6 +237,7 @@ ab>>2:     2;
>  @@ list from last
>  -e:0010  t2();
>  
> +-e
>      14:
>      15:
>      16:
> @@ -243,6 +246,7 @@ ab>>2:     2;
>  @@ list middle
>  -e:0010  t2();
>  
> +-e
>     x5:     t0();
>      6: }
>      7: sub t2 {


> $ git --version
> git version 2.22.0





-- 
Best regards,
Eugen Konkov


      reply	other threads:[~2019-08-02 15:58 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-02 15:39 bad patch created when I use --ignore-blank-lines option Eugen Konkov
2019-08-02 15:52 ` Eugen Konkov [this message]

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=56155941.20190802185256@yandex.ru \
    --to=kes-kes@yandex.ru \
    --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).