From: Junio C Hamano <gitster@pobox.com>
To: "Matwey V. Kornilov" <matwey.kornilov@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Fwd: Unknown option for merge-recursive: -X'diff-algorithm=patience'
Date: Thu, 04 Jan 2018 10:57:02 -0800 [thread overview]
Message-ID: <xmqqefn5fo5d.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <p2l6s0$eot$1@blaine.gmane.org> (Matwey V. Kornilov's message of "Thu, 4 Jan 2018 15:34:04 +0300")
"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?
next prev parent reply other threads:[~2018-01-04 18:57 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 [this message]
2018-01-04 19:25 ` Matwey V. Kornilov
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=xmqqefn5fo5d.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=matwey.kornilov@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.