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

Re: Fwd: Unknown option for merge-recursive: -X'diff-algorithm=patience'

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 4, 2018, 18:57 UTC
Message-ID
<xmqqefn5fo5d.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<p2l6s0$eot$1@blaine.gmane.org>
"Matwey V. Kornilov" <matwey.kornilov@gmail.com> writes:
Show 8 quoted lines
> It seems there is some issue with double escaping:
> ...
>> # git rebase --preserve-merges -s recursive -Xdiff-algorithm=patience
>> --onto abc-3.8 v3.8 abc-3.9
>> 
>> And then I see:
>> 
>> fatal: Unknown option for merge-recursive: -X'diff-algorithm=patience'

The string looks like a result of a shell script that quotes any end-user controlled string before incorporating into a string to be eval-ed, or something like that. Is this a recent regression? Does a bit older version of Git, like 2.12 or older, behave differently?

Previous: Matwey V. KornilovNext: Matwey V. Kornilov
Message 3 of 5 in “Fwd: Unknown option for merge-recursive: -X'diff-algorithm=patience'”
  1. Matwey V. KornilovJan 1, 2018
  2. Matwey V. KornilovJan 4, 2018
  3. Junio C HamanoJan 4, 2018
  4. Matwey V. KornilovJan 4, 2018
  5. Johannes SchindelinJan 4, 2018

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.