From: Junio C Hamano <gitster@pobox.com>
To: Nicolas Pitre <nico@fluxnic.net>
Cc: Nanako Shiraishi <nanako3@lavabit.com>,
"Bernhard R. Link" <brlink@debian.org>,
git@vger.kernel.org
Subject: Re: [PATCH] git-merge: a deprecation notice of the ancient command line syntax
Date: Mon, 30 Nov 2009 20:07:24 -0800 [thread overview]
Message-ID: <7viqcr72wz.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <alpine.LFD.2.00.0911302251270.5820@xanadu.home> (Nicolas Pitre's message of "Mon\, 30 Nov 2009 22\:55\:58 -0500 \(EST\)")
Nicolas Pitre <nico@fluxnic.net> writes:
> On Mon, 30 Nov 2009, Junio C Hamano wrote:
>
>> The ancient form of git merge command used in the original sample script
>> has been copied from Linus and are still found everywhere, I think, and
>> people may still have it in their scripts, but on the other hand, it is so
>> unintuitive that even people reasonably familiar with git is surprised by
>> accidentally triggering the support to parse this ancient form.
>>
>> Gently nudge people to upgrade their script to more recent and readable
>> style for eventual removal of the original syntax.
>>
>> Signed-off-by: Junio C Hamano <gitster@pobox.com>
>> ---
>>
>> And this is the first step of such a deprecation. Perhaps we start
>> warning in 1.7.0 and remove it in 1.8.0, or something like that.
>
> If this is going to be removed in the future, then it is already
> deprecated. Therefore it is much better to start warning now and not
> wait for 1.7.0. There is just no point delaying the advice.
Very true.
What I am not absolutely sure about is if the presense of the support for
ancient usage hurts people in real life so much that it is better to
remove it than keep it. At least we saw one example of a user (who is not
a novice) getting puzzled by it, but that may not be enough datapoint to
decide with.
next prev parent reply other threads:[~2009-12-01 4:07 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-30 14:43 equal-tree-merges as way to make rebases fast-forward-able Bernhard R. Link
2009-11-30 14:43 ` [PATCH 1/7] add new command git equal-tree-marker Bernhard R. Link
2009-11-30 15:36 ` Michael J Gruber
2009-11-30 14:44 ` [PATCH 2/7] add option to only visit the first parent of a equal tree merge Bernhard R. Link
2009-11-30 14:44 ` [PATCH 3/7] format-patch defaults to --first-equal-tree-only Bernhard R. Link
2009-11-30 14:44 ` [PATCH 4/7] support equal tree merges in interactive rebase Bernhard R. Link
2009-11-30 14:45 ` [PATCH 5/7] make rebase -m equal tree marker aware Bernhard R. Link
2009-11-30 14:45 ` [PATCH 6/7] add support for creating equal tree markers after rebase Bernhard R. Link
2009-11-30 14:45 ` [PATCH 7/7] add support for creating equal tree markers to rebase -i Bernhard R. Link
2009-11-30 15:10 ` equal-tree-merges as way to make rebases fast-forward-able Sverre Rabbelier
2009-11-30 15:31 ` Paolo Bonzini
2009-11-30 16:22 ` Bernhard R. Link
2009-11-30 15:35 ` Michael J Gruber
2009-11-30 15:59 ` Michael J Gruber
2009-11-30 16:54 ` Bernhard R. Link
2009-11-30 17:19 ` Johannes Schindelin
2009-11-30 18:18 ` Junio C Hamano
2009-11-30 18:55 ` Bernhard R. Link
2009-12-01 0:25 ` Junio C Hamano
2009-11-30 19:26 ` Johannes Sixt
2009-11-30 20:32 ` Junio C Hamano
2009-11-30 22:12 ` Nanako Shiraishi
2009-12-01 0:20 ` Junio C Hamano
2009-12-01 0:23 ` [PATCH] git-merge: a deprecation notice of the ancient command line syntax Junio C Hamano
2009-12-01 3:55 ` Nicolas Pitre
2009-12-01 4:07 ` Junio C Hamano [this message]
2009-12-02 10:20 ` equal-tree-merges as way to make rebases fast-forward-able Nanako Shiraishi
2009-12-02 18:03 ` Junio C Hamano
2009-12-01 11:50 ` Michael Haggerty
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=7viqcr72wz.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=brlink@debian.org \
--cc=git@vger.kernel.org \
--cc=nanako3@lavabit.com \
--cc=nico@fluxnic.net \
/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).