public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Junio C Hamano <gitster@pobox•com>
To: Johannes Sixt <j6t@kdbg•org>
Cc: Robin Rosenberg <robin.rosenberg@dewire•com>, git@vger•kernel.org
Subject: Re: [PATCH v3] Allow the user to change the temporary file name for mergetool
Date: Tue, 19 Aug 2014 15:14:21 -0700	[thread overview]
Message-ID: <xmqqk364unya.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <53F3B565.5080309@kdbg.org> (Johannes Sixt's message of "Tue, 19 Aug 2014 22:36:53 +0200")

Johannes Sixt <j6t@kdbg•org> writes:

> Am 19.08.2014 19:15, schrieb Robin Rosenberg:
>> Using the original filename suffix for the temporary input files to
>> the merge tool confuses IDEs like Eclipse. This patch introduces
>> a configurtion option, mergetool.tmpsuffix, which get appended to
>> the temporary file name. That way the user can choose to use a
>> suffix like ".tmp", which does not cause confusion.
>
> I have a merge tool that does syntax highlighting based on the file
> extension. Given this:
>
>> +	BACKUP="./$MERGED.BACKUP.$ext$tmpsuffix"
>> +	LOCAL="./$MERGED.LOCAL.$ext$tmpsuffix"
>> +	REMOTE="./$MERGED.REMOTE.$ext$tmpsuffix"
>> +	BASE="./$MERGED.BASE.$ext$tmpsuffix"
>
> I guess I lose syntax highlighting if I were to use mergetool.tmpsuffix;
> but then I don't use Eclipse. Could it be that this is really just a
> band-aid for Eclipse users, not IDEs in general as you are hinting in
> the Documentation of the new variable?

The phrase "IDEs like Eclipse" in the proposed log message did not
tell me (which I think is a good thing) if IDEs that need "band-aid"
are majority or minority, but I agree that we should not hint that
IDEs in general would benefit by setting this variable.  A warning
on the syntax-aware editors may be necessary.

Thanks for a careful reading.

next prev parent reply	other threads:[~2014-08-19 22:14 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-19 12:22 [PATCH] Allow the user to change the temporary file name for mergetool Robin Rosenberg
2014-08-19 12:52 ` Stefan Näwe
2014-08-19 14:55   ` [PATCH v2] " Robin Rosenberg
2014-08-19 17:02     ` Junio C Hamano
2014-08-19 17:15       ` [PATCH v3] " Robin Rosenberg
2014-08-19 18:01         ` Junio C Hamano
2014-08-19 20:36         ` Johannes Sixt
2014-08-19 22:14           ` Junio C Hamano [this message]
2014-08-20  7:24             ` Robin Rosenberg
2014-08-21  7:47               ` [PATCH v4] " Robin Rosenberg
2014-08-21 20:04                 ` Junio C Hamano
2014-08-20  7:22         ` [PATCH v3] " Stefan Näwe

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqk364unya.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=j6t@kdbg$(echo .)org \
    --cc=robin.rosenberg@dewire$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox