From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robert Dailey Subject: Re: Diffing submodule does not yield complete logs for merge commits Date: Fri, 29 May 2015 21:18:11 -0500 Message-ID: <55691DE3.70200@gmail.com> References: <20150501175757.GA10569@book.hvoigt.net> <5547C961.7070909@web.de> <37f399418bbebb3b53a50bf8daffcdc0@www.dscho.org> <20150518123036.GB16841@book.hvoigt.net> <20150519104413.GA17458@book.hvoigt.net> <20150521125122.GA22553@book.hvoigt.net> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Cc: Johannes Schindelin , Jens Lehmann , Git To: Heiko Voigt X-From: git-owner@vger.kernel.org Sat May 30 04:18:57 2015 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YyWMT-0006PY-79 for gcvg-git-2@plane.gmane.org; Sat, 30 May 2015 04:18:57 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756906AbbE3CSg (ORCPT ); Fri, 29 May 2015 22:18:36 -0400 Received: from mail-ob0-f178.google.com ([209.85.214.178]:33188 "EHLO mail-ob0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751373AbbE3CSd (ORCPT ); Fri, 29 May 2015 22:18:33 -0400 Received: by obbnx5 with SMTP id nx5so70039066obb.0 for ; Fri, 29 May 2015 19:18:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=KUQLJOIEe+GGH2U1NshFXDBgYPyw88zHvqmsoNnCHBc=; b=aK7WkrS2cWuXbA0Gtq822oYMMmzB6sC4OmKwji08ADsKy99LxL8zq7yKDcqcGYxcnR aRHLQ9XXdKb9RueOEt0i8RghO4fNeO0o1xvrTmecYJY+JW3nkYV6tyrCEuz5kVZYdjtm fbR1TrkbbgO03aGDxEienMV5y5Dx95uzk4LcRQU6UD6v4nwOrsqOfX849bZPohr7lsqb Ne85sRus1fP8MSsd8bf8COC6nIKazW0XLlotZJMWFDjcpRYpr+St6Nn5p4rtYjZyb1sg ASR3jYFYYvBnBMPPQQTLtLlvm0LDaIrKuYZdc0nvdog4MKW0/PTQ4QHK4ysPG6J+Ktbi gSJQ== X-Received: by 10.202.196.11 with SMTP id u11mr9017113oif.8.1432952313143; Fri, 29 May 2015 19:18:33 -0700 (PDT) Received: from [10.3.1.38] (107-141-24-53.lightspeed.rcsntx.sbcglobal.net. [107.141.24.53]) by mx.google.com with ESMTPSA id os15sm3890290oeb.8.2015.05.29.19.18.31 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 May 2015 19:18:32 -0700 (PDT) User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 In-Reply-To: <20150521125122.GA22553@book.hvoigt.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On 5/21/2015 7:51 AM, Heiko Voigt wrote: > On Tue, May 19, 2015 at 02:29:55PM -0500, Robert Dailey wrote: >> On Tue, May 19, 2015 at 5:44 AM, Heiko Voigt wrote: >>> On Mon, May 18, 2015 at 10:06:32AM -0500, Robert Dailey wrote: >>>> Unfortunately I find it unintuitive and counter productive to perform >>>> inline patches or do anything on a mailing list. Especially on >>>> Windows, it's a pain to setup git to effectively do this. Also I read >>>> mailing lists through Gmail which does not offer a proper monospace >>>> font view or syntax coloring to effectively review patches and >>>> comments pertaining to them. >>> >>> Are you sure you are not overestimating the effort it takes to send >>> patches inline? Once you've got your user agent correctly setup its just >>> a matter of copy and paste instead of attaching the patch. On Windows I >>> would probably use Thunderbird which has a section in the format-patch >>> documentation how to configure it. Compared to the effort you probably >>> spent on writing your patch isn't this bit of extra effort neglectable? >>> And your patch is almost done. It just needs some tests and maybe a few >>> rounds on the mailinglist after that. >>> >>>> Since I am not willing to properly follow your process, I will >>>> withdraw my patch. However it is here if someone else wishes to take >>>> it over. Really wish you guys used github's amazing features but I >>>> understand that Linus has already made his decision in that matter. >>> >>> It not just Linus decision it is also a matter of many people are used >>> to this workflow. AFAIR there have been many discussions and tries about >>> using other tools. Email has many advantages which a webinterface does >>> not provide. It is simply less effort that one person adjusts to this >>> workflow instead of changing many peoples working workflow. >>> >>>> I'm sorry I couldn't be more agreeable on the matter. Thanks for the >>>> time you spent reviewing my patch. >>> >>> If you are really this fixed in your workflow that would be too bad. >> >> How do you send your patches inline? Do you use git send-email? I have >> tried that and it is horrible to setup. Do you just copy/paste the >> patch inline in your compose window? > > For bigger patch series I did use send-email but currently I am back to > just using the compose window from whatever email client I am using. On > Windows that would be Thunderbird. But when possible I am not using > Windows. > >> It would be much simpler to fork Git, create a branch, make my change, >> and initiate a pull request. I can get email notifications on comments >> to my PR diff and address them with subsequent pushes to my branch >> (which would also automatically update the code review). Turn around >> times for collaborating on a change are much quicker via Github pull >> requests. > > I think that depends more on the collaborators than on the tool. When > you get quick replies the turnaround times with both workflows are > quick. > > It would be nice if there was a perfect solution for every project that > everyone could use but unfortunately there is not so we sometimes have > to adjust. But I think its more matter of what you are used to. If you > did not have a github account but email software setup you could > complain about the fact that you need to register a github account, fork > git, setup that fork in your local repository, ... instead of just copy > and paste your change into the compose window and then send it to a > mailinglist. > >> I am willing to review the typical workflow for contributing via git >> on mailing lists but I haven't seen any informative reading material >> on this. I just find using command line to email patches and dealing >> with other issues not worth the trouble. Lack of syntax highlighting, >> lack of monospace font, the fact that I'm basically forced to install >> mail client software just to contribute a single git patch. > > As already mentioned by Stefan there is Documentation/SubmittingPatches > in the Git repository that describes everything and also has a section > on how to do that with Thunderbird. > > I tend to not do much on the commandline on Windows since it basically > sucks there. For sending patches you just need > > git format-patch HEAD^ > > and thats it. > > Cheers Heiko > 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. 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?