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

From: Robert Dailey <rcdailey.lists@gmail.com>
Date: May 18, 2015, 15:06 UTC
Message-ID: <CAHd499CETM2jmZ2iJk=AoXtjLUCQ==u6q9Z5P-3EVGSY48FY_A@mail.gmail.com>
In-Reply-To: <20150518123036.GB16841@book.hvoigt.net>

On Mon, May 18, 2015 at 7:30 AM, Heiko Voigt <hvoigt@hvoigt.net> wrote:

Show 53 quoted lines

> Hi,
>
> On Fri, May 15, 2015 at 03:33:07PM -0500, Robert Dailey wrote:
>> On Tue, May 5, 2015 at 12:49 AM, Johannes Schindelin
>> <johannes.schindelin@gmx.de> wrote:
>> > Hi Robert,
>> >
>> > On 2015-05-04 22:21, Robert Dailey wrote:
>> >
>> >> Since I am not a linux user, I have implemented this feature against
>> >> the Git for Windows fork of git. I am not able to verify changes if I
>> >> make them directly against the Git repository.
>> >
>> > That is why I worked so hard on support of Vagrant: https://github.com/msysgit/msysgit/wiki/Vagrant -- in short, it makes it dead easy for you to set up a *minimal* Linux VM inside your Git SDK and interact with it via ssh.
>> >
>> > With the Vagrant solution, you can easily test Linux Git even on Windows.
>> >
>> > Ciao,
>> > Johannes
>>
>> At the moment I have a "half-ass" patch attached. This implements the
>> feature itself. I'm able to test this and it seems to be working.
>> Please note I'm a C++ developer and straight C / Bash are not my
>> strong suits. I apologize in advance for any mistakes. I am open to
>> taking recommendations for corrections.
>
> Please inline the patch, so people can easily comment. Have a look at
> Documentation/SubmittingPatches and patches on this list for an example.
> I have inlined your patch below for comments.
>
>> I'm not sure how I can verify the feature in a unit test. In addition
>> to learning bash scripting well enough to write the test, I am not
>> sure how to use git to check for the additional commits. Plus the repo
>> for the test will need to handle a submodule change to a merge commit
>> as well. Any advice on setting up a good test case for this? What
>> conditions should I check for, as far as log output goes?
>
> The testsuite can be found in t/ the README there describes most of it.
> Have a look at t4041-diff-submodule-option.sh and imitate the tests for
> the existing log option. What they basically do is: Write a file with
> the expected output of the diff and then compare the actual output with
> it. That should also be possible for your option.
>
> As for the merge commit: If there is no merge commit in the submodule
> that is used for testing you can simply add a sequence of git commands
> that manufactures the situation in the test repository as you need it.
>
> 'test_pause' is a helpful command to interactively debug/develop tests.
> Run the test with the -v -i switches (maybe -d) when developing.
>
> Comments for your patch please see below.
>
> <snip>

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.

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.

I'm sorry I couldn't be more agreeable on the matter. Thanks for the time you spent reviewing my patch.