From: Robert Dailey <rcdailey.lists@gmail.com>
To: Heiko Voigt <hvoigt@hvoigt.net>
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>,
Jens Lehmann <Jens.Lehmann@web.de>, Git <git@vger.kernel.org>
Subject: Re: Diffing submodule does not yield complete logs for merge commits
Date: Mon, 18 May 2015 10:06:32 -0500 [thread overview]
Message-ID: <CAHd499CETM2jmZ2iJk=AoXtjLUCQ==u6q9Z5P-3EVGSY48FY_A@mail.gmail.com> (raw)
In-Reply-To: <20150518123036.GB16841@book.hvoigt.net>
On Mon, May 18, 2015 at 7:30 AM, Heiko Voigt <hvoigt@hvoigt.net> wrote:
> 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.
next prev parent reply other threads:[~2015-05-18 15:06 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-29 20:53 Diffing submodule does not yield complete logs for merge commits Robert Dailey
2015-05-01 17:57 ` Heiko Voigt
2015-05-04 15:05 ` Robert Dailey
2015-05-04 19:32 ` Jens Lehmann
2015-05-04 20:21 ` Robert Dailey
2015-05-04 20:51 ` Heiko Voigt
2015-05-05 5:49 ` Johannes Schindelin
2015-05-15 20:33 ` Robert Dailey
2015-05-18 12:30 ` Heiko Voigt
2015-05-18 15:06 ` Robert Dailey [this message]
2015-05-19 10:44 ` Heiko Voigt
2015-05-19 19:29 ` Robert Dailey
2015-05-19 20:34 ` Stefan Beller
2015-05-22 9:17 ` Roberto Tyley
2015-05-21 12:51 ` Heiko Voigt
2015-05-30 2:18 ` Robert Dailey
2015-05-30 10:41 ` Heiko Voigt
2015-05-30 17:04 ` Junio C Hamano
2015-05-30 19:19 ` Robert Dailey
2015-05-30 19:37 ` Robert Dailey
2015-05-30 19:54 ` Junio C Hamano
2015-05-30 20:25 ` Robert Dailey
2015-06-02 12:02 ` Heiko Voigt
2015-05-04 21:03 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAHd499CETM2jmZ2iJk=AoXtjLUCQ==u6q9Z5P-3EVGSY48FY_A@mail.gmail.com' \
--to=rcdailey.lists@gmail.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=hvoigt@hvoigt.net \
--cc=johannes.schindelin@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).