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

Re: gitweb using "--cc"?

From
MCMarco Costalba <mcostalba@gmail.com>
Date
Feb 11, 2006, 09:17 UTC
Message-ID
<e5bfff550602110117i7b742351m14e908de10aac12c@mail.gmail.com>
In-Reply-To
<7v3bis88y9.fsf@assigned-by-dhcp.cox.net>
On 2/9/06, Junio C Hamano <junkio@cox.net> wrote:
Show 5 quoted lines
>
> Does it matter?  I presume that a Porcelain that cares would
> rather use the traditional "diff-tree -m -r" to look at diff
> with each parent.  I dunno.
>
Yes, please preserve this behaviour.
I pulled today the diff-tree -c semantic change and now I see, in git archive:

$ git-diff-tree -r ca182053c7710a286d72102f4576cf32e0dafcfb ca182053c7710a286d72102f4576cf32e0dafcfb ::100644 100644 100644 538d21d808b7ccc287e7bdd947f1583eadcda28b 30479b4a19805132a16facf6342b1438427486b7 59042d1bc9ee65063455b50a0968efb0b8182577 MM Makefile

$ git-diff-tree -r -m ca182053c7710a286d72102f4576cf32e0dafcfb ca182053c7710a286d72102f4576cf32e0dafcfb :100644 100644 538d21d808b7ccc287e7bdd947f1583eadcda28b 59042d1bc9ee65063455b50a0968efb0b8182577 M Makefile :100644 100644 410b758aab7efc6d777f0344500f97b1cbc52946 6c47c3a3e1acb8badaadad42dfe3d0bd7a06cac3 M entry.c ca182053c7710a286d72102f4576cf32e0dafcfb :100644 100644 30479b4a19805132a16facf6342b1438427486b7 59042d1bc9ee65063455b50a0968efb0b8182577 M Makefile

Please _do not_ change this behaviour to make -m a no-op as stated in "diff-tree -c raw output" patch message (ee63802422af14e43eccce3c6dc4150a27ceb1a3).

qgit has the possibility to switch from "see all merge files" to "see interesting only", so we really need that difference between 'git-diff-tree -r' and 'git-diff-tree -r -m'

Anyhow I am very happy with this change because it broke qgit ;-) but when fixed it will have a lot of code removed and will be faster too.

Thanks Marco

Previous: Junio C HamanoNext: Junio C Hamano
Message 19 of 27 in “gitweb using "--cc"?”
  1. Linus TorvaldsFeb 8, 2006
  2. Junio C HamanoFeb 8, 2006
  3. Use describe to come up with the closest tag.Junio C Hamano, Feb 9, 2006
  4. Allow using --cc when showing a merge.Junio C Hamano, Feb 9, 2006
  5. Brian GerstFeb 9, 2006
  6. Linus TorvaldsFeb 9, 2006
  7. Junio C HamanoFeb 9, 2006
  8. Linus TorvaldsFeb 9, 2006
  9. Linus TorvaldsFeb 9, 2006
  10. Linus TorvaldsFeb 9, 2006
  11. Junio C HamanoFeb 9, 2006
  12. Linus TorvaldsFeb 9, 2006
  13. Linus TorvaldsFeb 9, 2006
  14. Junio C HamanoFeb 9, 2006
  15. Junio C HamanoFeb 9, 2006
  16. Junio C HamanoFeb 9, 2006
  17. Junio C HamanoFeb 9, 2006
  18. Junio C HamanoFeb 9, 2006
  19. Marco CostalbaFeb 11, 2006
  20. Junio C HamanoFeb 11, 2006
  21. Junio C HamanoFeb 11, 2006
  22. Junio C HamanoFeb 9, 2006
  23. Linus TorvaldsFeb 9, 2006
  24. Junio C HamanoFeb 9, 2006
  25. combine-diff: Record diff status a bit more faithfullyJunio C Hamano, Feb 10, 2006
  26. combine-diff: move formatting logic to show_combined_diff()Junio C Hamano, Feb 9, 2006
  27. Kay SieversFeb 9, 2006

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.