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

Re: Diffing submodule does not yield complete logs for merge commits

From
Heiko Voigt <hvoigt@hvoigt.net>
Date
May 30, 2015, 10:41 UTC
Message-ID
<20150530104129.GA4309@book.hvoigt.net>
In-Reply-To
<55691DE3.70200@gmail.com>
On Fri, May 29, 2015 at 09:18:11PM -0500, Robert Dailey wrote:
> So I am working on trying to setup my environment (VM through Virtual Box)
> to do some testing on this. You all have encouraged me to try the mailing
> list review model. So I won't give up yet.

I am not sure you need a VM or Linux environment. Of course it will be helpful in case your tests do no pass on Linux (which they sometimes do due to some differences between the OSes). But until we actually run into that problem I do not see anything wrong developing your change purely on Windows. Since it seems you are more familiar with that platform I would even encourage you to do so. That reduces the toolset friction which you might experience in a new environment. Even if you run into the problem, that your tests do not pass on Linux, we might be able to solve that on the list.

Have you seen the github pull request -> mailing list proxy thing[1]? If that helps you maybe you can test it and use it for your patch submission. I think nobody will be annoyed if we get some strange emails on the list during that testing phase since that might help more contributors to contribute.

Show 8 quoted lines
> In the meantime I'd like to ask, do we even need to add an option for this?
> What if we just make `diff.submodule log` not use --first-parent? This seems
> like a backward compatible change in of itself. And it's simpler to
> implement. I can't think of a good justification to add more settings to an
> already hugely complex configuration scheme for such a minor difference in
> behavior.
> 
> Thoughts?

This behavior has been with --first-parent for a long time. Even though it seems like a minor change in my experience there will be complaints from people that have got used to it and will now get big differences. You never know how people use it. Since the extra value (full-log) (AFAIR) has reached a consensus on the list and it allows us to satisfy both long log and short log users I would prefer to go that route.

Cheers Heiko
[1] http://article.gmane.org/gmane.comp.version-control.git/269699
Previous: Robert DaileyNext: Junio C Hamano
Message 17 of 24 in “Diffing submodule does not yield complete logs for merge commits”
  1. Robert DaileyApr 29, 2015
  2. Heiko VoigtMay 1, 2015
  3. Robert DaileyMay 4, 2015
  4. Jens LehmannMay 4, 2015
  5. Robert DaileyMay 4, 2015
  6. Heiko VoigtMay 4, 2015
  7. Johannes SchindelinMay 5, 2015
  8. Robert DaileyMay 15, 2015
  9. Heiko VoigtMay 18, 2015
  10. Robert DaileyMay 18, 2015
  11. Heiko VoigtMay 19, 2015
  12. Robert DaileyMay 19, 2015
  13. Stefan BellerMay 19, 2015
  14. Roberto TyleyMay 22, 2015
  15. Heiko VoigtMay 21, 2015
  16. Robert DaileyMay 30, 2015
  17. Heiko VoigtMay 30, 2015
  18. Junio C HamanoMay 30, 2015
  19. Robert DaileyMay 30, 2015
  20. Robert DaileyMay 30, 2015
  21. Junio C HamanoMay 30, 2015
  22. Robert DaileyMay 30, 2015
  23. Heiko VoigtJun 2, 2015
  24. Junio C HamanoMay 4, 2015

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.