git/list[1] front-page[2] threads[3] people[4] search[5] about
 

configure names for temporary files

From
SFSergio Ferrero <sferrero@ensoftcorp.com>
Date
Oct 7, 2014, 14:33 UTC
Message-ID
<CALpL35mjtg9ge321Vz_kS1wzbYz+z9H5R3L8FcpVSNO3AtZzVA@mail.gmail.com>
Hello,

I'd like to configure git with a specific merge tool to merge Simulink model files. I have followed the steps to configure the merge tool successfully.

I typed the following on Git Bash:
   git config --system mergetool.<merge_tool_name>.cmd '"<merge_tool_path>"
-base "$BASE" -local "$LOCAL" -remote "$REMOTE" -merged "$MERGED"'
where:
   - <merge_tool_name> is the name of the specific merge tool
   - <merge_tool_path> is the full path to the .exe file for the merge tool
   - the merge tool accepts the -base, -local, -remote and -merged arguments

Then, after a merge detects conflicts on a Simulink model, I run the following command on the Git Bash:

   git mergetool -t <merge_tool_name> <model_name>.mdl

This command properly launches the GUI of the merge tool, however it indicates that provided file names are invalid. They are of the form: <model_name>.mdl.<revision>.#.mdl, where <revision> is either LOCAL, REMOTE or BASE and # is a number.

The merge tool needs to open the model in MATLAB and MATLAB does not allow opening models with '.' in their names.

Thus, is there a way to configure Git so that temporary models are of the form <model_name>_mdl_<revision>_#.mdl instead of < model_name>.mdl.<revision>.#.mdl?

Other temp file name should also be ok as long as the file does not contains dots in the part that corresponds to the file name.

Thanks in advance, Sergio

Next: David Aguilar
Message 1 of 4 in “configure names for temporary files”
  1. Sergio FerreroOct 7, 2014
  2. David AguilarOct 8, 2014
  3. Junio C HamanoOct 8, 2014
  4. Sergio FerreroOct 10, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.