bad patch created when I use --ignore-blank-lines option

Commit Message

Eugen Konkov Aug. 2, 2019, 3:39 p.m. UTC

Hello Git,

I add and remove only blank lines at my file:

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



$ git --version
git version 2.22.0

Comments

Eugen Konkov Aug. 2, 2019, 3:52 p.m. UTC | #1

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

Patch

--- 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 {