* Possible diff regression in v1.7.6-473-g27af01d
@ 2011-10-24 9:23 Franz Schrober
2011-10-24 9:38 ` Thomas Rast
0 siblings, 1 reply; 3+ messages in thread
From: Franz Schrober @ 2011-10-24 9:23 UTC (permalink / raw
To: git@vger.kernel.org
Cc: marat@slonopotamus.org, rctay89@gmail.com, gitster@pobox.com,
franzschrober@yahoo.de
[-- Attachment #1: Type: text/plain, Size: 567 bytes --]
Hi,
I am using git to manage some patches on top of the actual upstream files, but noticed that the result of git-format-patch changed between 4bfe7cb6668c43c1136304bbb17eea1b3ddf0237 and 27af01d552331eacf1ed2671b2b4b6ad4c268106
I've attached two input files (I tried to provide a minimal example... I am not sure if a smaller example is possible but at least both files are smaller than 10 lines) and the results with version 1.7.6.3 and and 1.7.7. The diffs were created using: git diff anonymized_orig anonymized_new
My .gitconfig file is empty.
Thanks
[-- Attachment #2: anonymized_orig --]
[-- Type: application/octet-stream, Size: 8 bytes --]
0
0
0
0
[-- Attachment #3: anonymized_new --]
[-- Type: application/octet-stream, Size: 16 bytes --]
1
2
0
3
4
5
6
7
[-- Attachment #4: diff.1.7.6.3 --]
[-- Type: application/octet-stream, Size: 171 bytes --]
diff --git a/anonymized_orig b/anonymized_new
index 44e0be8..ad0f859 100644
--- a/anonymized_orig
+++ b/anonymized_new
@@ -1,4 +1,8 @@
-0
-0
-0
-0
+1
+2
+0
+3
+4
+5
+6
+7
[-- Attachment #5: diff.1.7.7 --]
[-- Type: application/octet-stream, Size: 168 bytes --]
diff --git a/anonymized_orig b/anonymized_new
index 44e0be8..ad0f859 100644
--- a/anonymized_orig
+++ b/anonymized_new
@@ -1,4 +1,8 @@
+1
+2
0
-0
-0
-0
+3
+4
+5
+6
+7
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: Possible diff regression in v1.7.6-473-g27af01d
2011-10-24 9:23 Possible diff regression in v1.7.6-473-g27af01d Franz Schrober
@ 2011-10-24 9:38 ` Thomas Rast
2011-10-24 10:11 ` Tay Ray Chuan
0 siblings, 1 reply; 3+ messages in thread
From: Thomas Rast @ 2011-10-24 9:38 UTC (permalink / raw
To: Franz Schrober
Cc: git@vger.kernel.org, marat@slonopotamus.org, rctay89@gmail.com,
gitster@pobox.com
Franz Schrober wrote:
> Hi,
>
> I am using git to manage some patches on top of the actual upstream files, but noticed that the result of git-format-patch changed between 4bfe7cb6668c43c1136304bbb17eea1b3ddf0237 and 27af01d552331eacf1ed2671b2b4b6ad4c268106
>
> I've attached two input files (I tried to provide a minimal example... I am not sure if a smaller example is possible but at least both files are smaller than 10 lines) and the results with version 1.7.6.3 and and 1.7.7. The diffs were created using: git diff anonymized_orig anonymized_new
>
> My .gitconfig file is empty.
I'm not sure why you call this a regression. For the benefit of
people who hate saving attachments, you used
$ paste anonymized_orig anonymized_new | xclip
0 1
0 2
0 0
0 3
4
5
6
7
the old diff was
--- a/anonymized_orig
+++ b/anonymized_new
@@ -1,4 +1,8 @@
-0
-0
-0
-0
+1
+2
+0
+3
+4
+5
+6
+7
and the new diff is
--- a/anonymized_orig
+++ b/anonymized_new
@@ -1,4 +1,8 @@
+1
+2
0
-0
-0
-0
+3
+4
+5
+6
+7
So the new diff correctly represents the change, and on top of that is
shorter (by only one line, admittedly). What makes it a regression?
--
Thomas Rast
trast@{inf,student}.ethz.ch
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Possible diff regression in v1.7.6-473-g27af01d
2011-10-24 9:38 ` Thomas Rast
@ 2011-10-24 10:11 ` Tay Ray Chuan
0 siblings, 0 replies; 3+ messages in thread
From: Tay Ray Chuan @ 2011-10-24 10:11 UTC (permalink / raw
To: Thomas Rast
Cc: Franz Schrober, git@vger.kernel.org, marat@slonopotamus.org,
gitster@pobox.com
On Mon, Oct 24, 2011 at 5:38 PM, Thomas Rast <trast@student.ethz.ch> wrote:
>
> I'm not sure why you call this a regression. For the benefit of
> people who hate saving attachments, you used
>
> $ paste anonymized_orig anonymized_new | xclip
> 0 1
> 0 2
> 0 0
> 0 3
> 4
> 5
> 6
> 7
>
> the old diff was
>
> --- a/anonymized_orig
> +++ b/anonymized_new
> @@ -1,4 +1,8 @@
> -0
> -0
> -0
> -0
> +1
> +2
> +0
> +3
> +4
> +5
> +6
> +7
>
> and the new diff is
>
> --- a/anonymized_orig
> +++ b/anonymized_new
> @@ -1,4 +1,8 @@
> +1
> +2
> 0
> -0
> -0
> -0
> +3
> +4
> +5
> +6
> +7
>
> So the new diff correctly represents the change, and on top of that is
> shorter (by only one line, admittedly). What makes it a regression?
Thanks for inlining it, Thomas.
> Franz Schrober wrote:>> Hi,>>>> I am using git to manage some patches on top of the actual upstream files, but noticed that the result of git-format-patch changed between 4bfe7cb6668c43c1136304bbb17eea1b3ddf0237 and 27af01d552331eacf1ed2671b2b4b6ad4c268106>>>> I've attached two input files (I tried to provide a minimal example... I am not sure if a smaller example is possible but at least both files are smaller than 10 lines) and the results with version 1.7.6.3 and and 1.7.7. The diffs were created using: git diff anonymized_orig anonymized_new>>>> My .gitconfig file is empty.
This has been "fixed" in v1.7.7.1, with 713b85c (Merge branch
'rs/diff-cleanup-records-fix' into maint) - "fixed" in that it gives
back the old behaviour, not that the diff produced is incorrect and
needs fixing.
(I'm running 1.7.7.1.599.g03eec, I get the same diff as diff.1.7.6.3)
--
Cheers,
Ray Chuan
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-10-24 10:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-24 9:23 Possible diff regression in v1.7.6-473-g27af01d Franz Schrober
2011-10-24 9:38 ` Thomas Rast
2011-10-24 10:11 ` Tay Ray Chuan
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).