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
Matwey V. Kornilov <matwey.kornilov@gmail.com>
Date
Jan 4, 2018, 19:25 UTC
Message-ID
<CAJs94EbtnCcKiYO9sSqhOwtkSCsApRJoSzVEA7_N23wXGhwoww@mail.gmail.com>
In-Reply-To
<xmqqefn5fo5d.fsf@gitster.mtv.corp.google.com>
2018-01-04 21:57 GMT+03:00 Junio C Hamano <gitster@pobox.com>:
Show 16 quoted lines
> "Matwey V. Kornilov" <matwey.kornilov@gmail.com> writes:
>
>> 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?
>

I've just checked, 2.12.4 has the same behaviour. By the way, can you reproduce this at all?

-- 
With best regards,
Matwey V. Kornilov
Previous: Junio C HamanoNext: Johannes Schindelin
Message 4 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.