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

Re: [PATCH] mergetool--lib: Allow custom commands to override built-ins

From
Ramkumar Ramachandra <artagnon@gmail.com>
Date
Sep 26, 2012, 10:03 UTC
Message-ID
<CALkWK0naJt840LfMNBM7EtdyLE5nmJeAsxG-Wttj8c84O5X7jA@mail.gmail.com>
In-Reply-To
<1348559291-71739-1-git-send-email-davvid@gmail.com>
Hi David,
David Aguilar wrote:
Show 12 quoted lines
>  diff_cmd () {
> -       merge_tool_cmd="$(get_merge_tool_cmd "$1")"
> -       if test -z "$merge_tool_cmd"
> -       then
> -               status=1
> -               break
> -       fi
> -       ( eval $merge_tool_cmd )
> -       status=$?
> +       status=1
>         return $status
>  }
Nit: Why not return 1, instead of setting $status and returning it?
Ram
Previous: David AguilarNext: Junio C Hamano
Message 2 of 4 in “mergetool--lib: Allow custom commands to override built-ins”
  1. mergetool--lib: Allow custom commands to override built-insDavid Aguilar, Sep 25, 2012
  2. Ramkumar RamachandraSep 26, 2012
  3. Junio C HamanoSep 26, 2012
  4. David AguilarSep 26, 2012

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.