git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* Diff for unmerged files always misses the `\ No newline at end of file` mark
@ 2022-06-23 15:39 Danil Pristupov
  2022-06-25 11:49 ` brian m. carlson
  0 siblings, 1 reply; 2+ messages in thread
From: Danil Pristupov @ 2022-06-23 15:39 UTC (permalink / raw)
  To: git

Some time ago I reported a bug there, but got no response. I hope it's
OK if I post it again.

Diff for unmerged files always misses the `\ No newline at end of file` mark.

I was able to reproduce this with all git versions on all platforms.

Steps to reproduce (macOS, 2.32.0 (Apple Git-132)):

```
git init
echo "line1\nline2" > eol.txt
echo -n "line1\nline2" > noeol.txt
git add .
git commit -m "initial"
git branch br1
echo "line11\nline2" > eol.txt
echo -n "line11\nline2" > noeol.txt
git add .
git commit -m "line1"
git checkout br1
echo "line12\nline2" > eol.txt
echo -n "line12\nline2" > noeol.txt
git add .
git commit -m "line2"
git merge master
git diff -- eol.txt > eol.diff
git diff -- noeol.txt > noeol.diff
```

Expected behavior: `noeol.diff` must have the `\\ No newline at end of
file` mark (I guess double slash `\` must be used as a prefix)

```
$ git diff -- eol.txt
diff --cc eol.txt
index 3dc0c7e,5328e33..0000000
--- a/eol.txt
+++ b/eol.txt
@@@ -1,2 -1,2 +1,6 @@@
++<<<<<<< HEAD
 +line12
++=======
+ line11
++>>>>>>> master
  line2
\\ No newline at end of file
```

Actual behavior: `noeol.diff` does NOT have the `\\ No newline at end
of file` mark

```
$ git diff -- eol.txt
diff --cc eol.txt
index 3dc0c7e,5328e33..0000000
--- a/eol.txt
+++ b/eol.txt
@@@ -1,2 -1,2 +1,6 @@@
++<<<<<<< HEAD
 +line12
++=======
+ line11
++>>>>>>> master
  line2
```

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: Diff for unmerged files always misses the `\ No newline at end of file` mark
  2022-06-23 15:39 Diff for unmerged files always misses the `\ No newline at end of file` mark Danil Pristupov
@ 2022-06-25 11:49 ` brian m. carlson
  0 siblings, 0 replies; 2+ messages in thread
From: brian m. carlson @ 2022-06-25 11:49 UTC (permalink / raw)
  To: Danil Pristupov; +Cc: git

[-- Attachment #1: Type: text/plain, Size: 1273 bytes --]

On 2022-06-23 at 15:39:07, Danil Pristupov wrote:
> Some time ago I reported a bug there, but got no response. I hope it's
> OK if I post it again.
> 
> Diff for unmerged files always misses the `\ No newline at end of file` mark.
> 
> I was able to reproduce this with all git versions on all platforms.
> 
> Steps to reproduce (macOS, 2.32.0 (Apple Git-132)):
> 
> ```
> git init
> echo "line1\nline2" > eol.txt
> echo -n "line1\nline2" > noeol.txt
> git add .
> git commit -m "initial"
> git branch br1
> echo "line11\nline2" > eol.txt
> echo -n "line11\nline2" > noeol.txt
> git add .
> git commit -m "line1"
> git checkout br1
> echo "line12\nline2" > eol.txt
> echo -n "line12\nline2" > noeol.txt
> git add .
> git commit -m "line2"
> git merge master
> git diff -- eol.txt > eol.diff
> git diff -- noeol.txt > noeol.diff
> ```

Thanks for the report.  I think this is indeed a bug, but maybe someone
more familiar with things than I am can confirm.

From a preliminary examination, it looks like the --cc and regular modes
render diffs completely differently, and code similar to what's at the
end of emit_rewrite_lines belongs at the end of dump_sline as well.
-- 
brian m. carlson (he/him or they/them)
Toronto, Ontario, CA

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 263 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-06-25 12:03 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-23 15:39 Diff for unmerged files always misses the `\ No newline at end of file` mark Danil Pristupov
2022-06-25 11:49 ` brian m. carlson

Code repositories for project(s) associated with this 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).