From: "Matwey V. Kornilov" <matwey.kornilov@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: Fwd: Unknown option for merge-recursive: -X'diff-algorithm=patience'
Date: Thu, 4 Jan 2018 22:25:04 +0300 [thread overview]
Message-ID: <CAJs94EbtnCcKiYO9sSqhOwtkSCsApRJoSzVEA7_N23wXGhwoww@mail.gmail.com> (raw)
In-Reply-To: <xmqqefn5fo5d.fsf@gitster.mtv.corp.google.com>
2018-01-04 21:57 GMT+03:00 Junio C Hamano <gitster@pobox.com>:
> "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
next prev parent reply other threads:[~2018-01-04 19:25 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <9e4ffb63-59de-a020-fee8-6cefae3b3dda@gmail.com>
2018-01-01 11:28 ` Fwd: Unknown option for merge-recursive: -X'diff-algorithm=patience' Matwey V. Kornilov
2018-01-04 12:34 ` Matwey V. Kornilov
2018-01-04 18:57 ` Junio C Hamano
2018-01-04 19:25 ` Matwey V. Kornilov [this message]
2018-01-04 21:02 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAJs94EbtnCcKiYO9sSqhOwtkSCsApRJoSzVEA7_N23wXGhwoww@mail.gmail.com \
--to=matwey.kornilov@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).