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

Re: [PATCH 1/2] Allow to override mergetool.prompt with $GIT_MERGETOOL*_PROMPT

From
Johannes Sixt <j.sixt@viscovery.net>
Date
Jan 20, 2010, 15:59 UTC
Message-ID
<4B572870.6090001@viscovery.net>
In-Reply-To
<4B572192.2020606@gmail.com>
Sebastian Schuberth schrieb:
> +should_prompt_merge () {
> +	local prompt=$(git config --bool mergetool.prompt || echo true)
'local' is not portable. (The next patch shouldn't introduce it, either.)
> -prompt=$(git config --bool mergetool.prompt || echo true)
> +should_prompt_merge
> +prompt=$?

Previously, prompt was either "true" or "false", but now it is a number. This is not what the user (function merge_file) expects.

-- Hannes
Previous: Sebastian SchuberthNext: Sebastian Schuberth
Message 2 of 6 in “Allow to override mergetool.prompt with $GIT_MERGETOOL*_PROMPT”
  1. 1/2 Allow to override mergetool.prompt with $GIT_MERGETOOL*_PROMPTSebastian Schuberth, Jan 20, 2010
  2. Johannes SixtJan 20, 2010
  3. Sebastian SchuberthJan 20, 2010
  4. David AguilarJan 21, 2010
  5. Sebastian SchuberthJan 21, 2010
  6. David AguilarJan 22, 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.