git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: git diff: add option for omitting the contents of deletes

From
Mart Sõmermaa <mrts.pydev@gmail.com>
Date
Mar 8, 2011, 21:25 UTC
Message-ID
<AANLkTim9juvhBJKraHBkV8AC=zY75xt_1BnyhTDTcoUZ@mail.gmail.com>
In-Reply-To
<7vipvte6jc.fsf@alter.siamese.dyndns.org>
On Tue, Mar 8, 2011 at 9:49 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 13 quoted lines
> Mart Sõmermaa <mrts.pydev@gmail.com> writes:
>
>> On Tue, Mar 1, 2011 at 2:11 AM, Junio C Hamano <gitster@pobox.com> wrote:
>>> In any case, a minimum patch to give what Mart wanted to see would
>>> probably look like this.  I'll leave bugfixes, documentation and tests to
>>> the readers ;-).
>>
>> The minimum looks to be the optimum -- IMHO this is entirely sufficient,
>
> I suspect not, as I don't think I ever did anything to the codepath for -B
> output, and I also recall spending some time thinking about this issue in
> an earlier message that I mentioned -B besides "deletion", none of the
> suggestions in which I don't think I tried to implement.
Your suggestion is as follows:

"It also might make sense to apply the similar principle to shorten the output with -B when a rewrite patch is expressed as a single hunk patch that removes everything old and then adds everthing new."

I have to admit that I've never used -B, only -M, so please don't mind that its semantics and exact behavior are a bit foreign to me.

After running t/t4130-apply-criss-cross-rename.sh, `git diff -M -B` outputs the following:

diff --git a/file2 b/file1
similarity index 100%
rename from file2
rename to file1
diff --git a/file1 b/file2
similarity index 100%
rename from file1
rename to file2

Can you bring a similar example of changes in the output after
the above-mentioned similar principle has been implemented for -B?

> I also vaguely recall that I suspected that the output may not have the
> usual "index deadbeaf..000000 mode" line and that I chose to ignore it.

'deadbeaf' is present:

$ ../git/bin-wrappers/git diff -D HEAD
diff --git a/foo.txt b/foo.txt
deleted file mode 100644
index 257cc56..0000000

Can we perhaps consider the -B behavior orthogonal to -D (unless I am missing
something very important here)?

Best regards,
MS
Previous: Junio C HamanoNext: Jeff King
Message 23 of 32 in “git diff: add option for omitting the contents of deletes”
  1. Mart SõmermaaFeb 26, 2011
  2. Junio C HamanoFeb 26, 2011
  3. Michael J GruberFeb 27, 2011
  4. Mart SõmermaaFeb 27, 2011
  5. Michael J GruberFeb 28, 2011
  6. Mart SõmermaaFeb 28, 2011
  7. Junio C HamanoFeb 27, 2011
  8. Junio C HamanoFeb 27, 2011
  9. Michael J GruberFeb 28, 2011
  10. Jeff KingFeb 28, 2011
  11. Jeff KingFeb 28, 2011
  12. Michael J GruberFeb 28, 2011
  13. Jeff KingFeb 28, 2011
  14. Michael J GruberFeb 28, 2011
  15. Jeff KingFeb 28, 2011
  16. Junio C HamanoFeb 28, 2011
  17. Jeff KingFeb 28, 2011
  18. Junio C HamanoFeb 28, 2011
  19. Junio C HamanoMar 1, 2011
  20. Mart SõmermaaMar 7, 2011
  21. Michael J GruberMar 8, 2011
  22. Junio C HamanoMar 8, 2011
  23. Mart SõmermaaMar 8, 2011
  24. Jeff KingMar 8, 2011
  25. symling diff driver (Was: Re: git diff: add option for omitting the contents of deletes)Michael J Gruber, Feb 28, 2011
  26. Jeff KingFeb 28, 2011
  27. attr: make attributes depend on file typeMichael J Gruber, Feb 28, 2011
  28. Jeff KingFeb 28, 2011
  29. Junio C HamanoFeb 28, 2011
  30. Michael J GruberMar 1, 2011
  31. Mart SõmermaaFeb 28, 2011
  32. Michael J GruberFeb 28, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.