From: Andre Bossert <anb0s@anbos.de>
Subject: git mergetool: create temporary files in different sub-folders but
 with same filenames
Date: Tue, 02 Jun 2015 20:48:25 +0200
Message-ID: <556DFA79.9020904@anbos.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
To: git@vger.kernel.org
Envelope-to: gcvg-git-2@plane.gmane.org
User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0
Sender: git-owner@vger.kernel.org
Precedence: bulk
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/270583>

Hello,

we are moving from ClearCase to Git (MSYS 1.9.5 at Win7x64) and trying 
to configure one special merge tool "DiffMerge" for IBM Rhapsody files. 
So we've added our merge tool (script) to gitconfig. The merge script 
calls the DiffMerge for some file-extensions (sbs, rpy etc.). It works 
in general, but the different file names passed to DiffMerge (e.g. 
<base-name>.LOCAL.xyz.<ext>, <base-name>.REMOTE.xyz.<ext>) are shown as 
conflict  --> user have to solve it manually.

I've found the new feature (mergetool.writeToTemp = true) in 
"https://github.com/git/git/blob/master/git-mergetool.sh 
<https://github.com/git/git/blob/master/git-mergetool.sh>" that creates 
one temporary folder for all four files with different names. I've added 
some handling for sub-folders.

Instead of:
     BACKUP="./$MERGED.BACKUP.$ext"
     LOCAL="./$MERGED.LOCAL.$ext"
     REMOTE="./$MERGED.REMOTE.$ext"
     BASE="./$MERGED.BASE.$ext"

i've added this definitions (and some other handling for creation etc.)
...
     TEMP_BACKUP="$MERGETOOL_TMPDIR/BACKUP"
     TEMP_LOCAL="$MERGETOOL_TMPDIR/LOCAL"
     TEMP_REMOTE="$MERGETOOL_TMPDIR/REMOTE"
     TEMP_BASE="$MERGETOOL_TMPDIR/BASE"

     BACKUP="$TEMP_BACKUP/${BASE}$ext"
     LOCAL="$TEMP_LOCAL/${BASE}$ext"
     REMOTE="$TEMP_REMOTE/${BASE}$ext"
     BASE="$TEMP_BASE/${BASE}$ext"
...

I've tested the script with normal merge-workflows and it worked. May i 
request a review and integration in Git?

-- 
Regards
Andre (anb0s)
eMail: anb0s@anbos.de <mailto:anb0s@anbos.de>