threads / patch / 23243

v2, 2 partsgit-gui: git-gui: change to display the diff with the HEAD in the case of conflicts.

Subject: [PATCH v2 0/2] git-gui: git-gui: change to display the diff with the HEAD in the case of conflicts.

## tl;dr

5 messages between Mar 29, 2010 and Mar 30, 2010. Diffs are folded; open one to read it.

replies: 4people: 2as markdown or json

Jon Seymour· Mar 29, 2010, 23:00 UTC · lore

Resending because my original patch series wasn't whitespace clean and I have now removed the configuration to make the safe behaviour optional - it is not safe by default.

If there is any other reason why this patch should not be considered, please let me know.

[PATCH v2 1/2] git-gui: Introduce is_unmerged global variable to encapsulate its derivation. [PATCH v2 2/2] git-gui: change to display the diff with the HEAD in the case of conflicts.

jon.

Jon Seymour· Mar 29, 2010, 23:02 UTC · re: Jon Seymour · lore

Re: [PATCH v2 0/2] git-gui: git-gui: change to display the diff with the HEAD in the case of conflicts.

|  __not__ -> __now__

On Tue, Mar 30, 2010 at 10:00 AM, Jon Seymour <jon.seymour@gmail.com> wrote:

Show 14 quoted lines

> Resending because my original patch series wasn't whitespace clean and
> I have now removed the configuration to make the safe behaviour
> optional - it is __now__ safe by default.
>
> If there is any other reason why this patch should not be considered,
> please let me know.
>
> [PATCH v2 1/2] git-gui: Introduce is_unmerged global variable to
> encapsulate its derivation.
> [PATCH v2 2/2] git-gui: change to display the diff with the HEAD in
> the case of conflicts.
>
> jon.
>

Jon Seymour· Mar 29, 2010, 23:08 UTC · re: Jon Seymour · lore

Re: [PATCH v2 0/2] git-gui: git-gui: change to display the diff with the HEAD in the case of conflicts.

Apologies, it broke again.

The command I ran to submit the patch was:

   git format-patch -M git-gui-patch~2.. --stdout | git imap-send

I did with git 1.6.6.1, running on cygwin however this process appears to be corrupting the patch.

Can anyone let me know what I have done wrong?

jon.

On Tue, Mar 30, 2010 at 10:00 AM, Jon Seymour <jon.seymour@gmail.com> wrote:

Show 14 quoted lines

> Resending because my original patch series wasn't whitespace clean and
> I have now removed the configuration to make the safe behaviour
> optional - it is not safe by default.
>
> If there is any other reason why this patch should not be considered,
> please let me know.
>
> [PATCH v2 1/2] git-gui: Introduce is_unmerged global variable to
> encapsulate its derivation.
> [PATCH v2 2/2] git-gui: change to display the diff with the HEAD in
> the case of conflicts.
>
> jon.
>

Johannes Sixt· Mar 30, 2010, 06:44 UTC · re: Jon Seymour · lore

Re: [PATCH v2 0/2] git-gui: git-gui: change to display the diff with the HEAD in the case of conflicts.

Am 3/30/2010 1:00, schrieb Jon Seymour:

Show 11 quoted lines

> Resending because my original patch series wasn't whitespace clean and
> I have now removed the configuration to make the safe behaviour
> optional - it is not safe by default.
> 
> If there is any other reason why this patch should not be considered,
> please let me know.
> 
> [PATCH v2 1/2] git-gui: Introduce is_unmerged global variable to
> encapsulate its derivation.
> [PATCH v2 2/2] git-gui: change to display the diff with the HEAD in
> the case of conflicts.

The default mode of diff in the case of conflicts is "condensed combined", which removes "unintersting" changes from the display. AFAIK, there also exists a mode that is only "combined". I would think that this mode is much more useful here because it shows the diff to both HEAD and MERGE_HEADs at the same time.

Only that I don't know how to invoke this mode...

-- Hannes

Jon Seymour· Mar 30, 2010, 07:00 UTC · lore

And to the list...

On Tue, Mar 30, 2010 at 5:44 PM, Johannes Sixt <j.sixt@viscovery.net> wrote:

Show 20 quoted lines

> Am 3/30/2010 1:00, schrieb Jon Seymour:
>> Resending because my original patch series wasn't whitespace clean and
>> I have now removed the configuration to make the safe behaviour
>> optional - it is not safe by default.
>>
>> If there is any other reason why this patch should not be considered,
>> please let me know.
>>
>> [PATCH v2 1/2] git-gui: Introduce is_unmerged global variable to
>> encapsulate its derivation.
>> [PATCH v2 2/2] git-gui: change to display the diff with the HEAD in
>> the case of conflicts.
>
> The default mode of diff in the case of conflicts is "condensed combined",
> which removes "unintersting" changes from the display. AFAIK, there also
> exists a mode that is only "combined". I would think that this mode is
> much more useful here because it shows the diff to both HEAD and
> MERGE_HEADs at the same time.
>
> Only that I don't know how to invoke this mode...

You mean in a similar way to the way that gitk displays the diff when you select a merge commit?

jon.