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

[PATCH] git-mergetool--lib.sh: fix mergetool.<tool>.* configurations ignored for known tools

From
Sylvain Rabot <sylvain@abstraction.fr>
Date
Jun 5, 2010, 02:31 UTC
Message-ID
<1275705112-8088-1-git-send-email-sylvain@abstraction.fr>
Hi,

Here a patch I made after Junio's remarks in this thread : http://thread.gmane.org/gmane.comp.version-control.git/148267

I think git-mergetool--lib.sh needs some refactoring. I'm no sh expert, far from it, but I know a bit about scripting (I have been developing in PHP for more than 6 years now :P) and I had quite some difficulties to understand the behavior of some functions. For example, get_merge_tool_path returns the name of the tool if no mergetool.<tool>.path have been set, which, from my point of view, makes no sense.

I know there is maybe no time or no need to rewrite something which works rather well but the +5 hours I spent to write this poor patch make me wonder if I am overrating myself. So if someone could just agree with me that would be a huge step to help me to regain some self respect :)

Cheers.
Next: Sylvain Rabot
Message 1 of 9 in “git-mergetool--lib.sh: fix mergetool.<tool>.* configurations ignored for known tools”
  1. git-mergetool--lib.sh: fix mergetool.<tool>.* configurations ignored for known toolsSylvain Rabot, Jun 5, 2010
  2. git-mergetool--lib.sh: fix mergetool.<tool>.* configurations ignored for known toolsSylvain Rabot, Jun 5, 2010
  3. Andreas SchwabJun 5, 2010
  4. Sylvain RabotJun 5, 2010
  5. David AguilarJun 8, 2010
  6. Junio C HamanoJun 8, 2010
  7. Sylvain RabotJun 11, 2010
  8. Charles BaileyJun 9, 2010
  9. Sylvain RabotJun 11, 2010

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.