From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <git-owner@vger.kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net
X-Spam-Level: 
X-Spam-ASN: AS31976 209.132.180.0/23
X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,
	RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by dcvr.yhbt.net (Postfix) with ESMTP id 3D54B202A0
	for <e@80x24.org>; Fri, 17 Nov 2017 01:18:48 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1754459AbdKQBSq (ORCPT <rfc822;e@80x24.org>);
        Thu, 16 Nov 2017 20:18:46 -0500
Received: from pb-smtp2.pobox.com ([64.147.108.71]:55821 "EHLO
        sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org
        with ESMTP id S1753565AbdKQBSp (ORCPT <rfc822;git@vger.kernel.org>);
        Thu, 16 Nov 2017 20:18:45 -0500
Received: from sasl.smtp.pobox.com (unknown [127.0.0.1])
        by pb-smtp2.pobox.com (Postfix) with ESMTP id EC8E19E616;
        Thu, 16 Nov 2017 20:18:44 -0500 (EST)
DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc
        :subject:references:date:in-reply-to:message-id:mime-version
        :content-type; s=sasl; bh=8q9c0gGPucJjCRRsvHCAwtgypfM=; b=eM5HaN
        gYtEMTjniyCsVJUkdGj3FPdrgJmSjIwvMwxFxN1iaVgHDPmvPxvu4yibUvEGiGjb
        AlRq7t8+D/BIlKvivqLc/zpuRtd1HHVIUHbPfW+eItgFgw6IFYrcfOM0McccOvLw
        BlyeDtrzlxLm0JKaJHWFLHeCybzSz9AfXuIKY=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc
        :subject:references:date:in-reply-to:message-id:mime-version
        :content-type; q=dns; s=sasl; b=E70/T/uBqGIi8RjBd1tX1TusDvKWOHU5
        0jM5CjBkFmc4MuK22jmrLSPDcuVnPD1IAmBAZ99VQs3utSslBMcQ5SaiZ8GBatsB
        8TbRwOH9ujnhK1ZowLmvwcP/ibH48BSLq8sPb1BJKD8PQxZDm2huVRfIqHkFlKiw
        N3Yn4q6puis=
Received: from pb-smtp2.nyi.icgroup.com (unknown [127.0.0.1])
        by pb-smtp2.pobox.com (Postfix) with ESMTP id E4E719E615;
        Thu, 16 Nov 2017 20:18:44 -0500 (EST)
Received: from pobox.com (unknown [104.132.0.95])
        (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits))
        (No client certificate requested)
        by pb-smtp2.pobox.com (Postfix) with ESMTPSA id 5E1F59E613;
        Thu, 16 Nov 2017 20:18:44 -0500 (EST)
From:   Junio C Hamano <gitster@pobox.com>
To:     Todd Zullinger <tmz@pobox.com>
Cc:     git@vger.kernel.org, Kaartic Sivaraam <kaartic.sivaraam@gmail.com>,
        Martin =?utf-8?Q?=C3=85gren?= <martin.agren@gmail.com>
Subject: Re: [PATCH] branch doc: remove --set-upstream from synopsis
References: <20171116074643.19614-1-tmz@pobox.com>
Date:   Fri, 17 Nov 2017 10:18:43 +0900
In-Reply-To: <20171116074643.19614-1-tmz@pobox.com> (Todd Zullinger's message
        of "Thu, 16 Nov 2017 02:46:43 -0500")
Message-ID: <xmqqzi7lu2h8.fsf@gitster.mtv.corp.google.com>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2.50 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
X-Pobox-Relay-ID: 411A24BE-CB35-11E7-B2A4-575F0C78B957-77302942!pb-smtp2.pobox.com
Sender: git-owner@vger.kernel.org
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org

Todd Zullinger <tmz@pobox.com> writes:

> Support for the --set-upstream option was removed in 52668846ea
> (builtin/branch: stop supporting the "--set-upstream" option,
> 2017-08-17), after a long deprecation period.
>
> Remove the option from the command synopsis for consistency.  Replace
> another reference to it in the description of `--delete` with
> `--set-upstream-to`.
>
> Signed-off-by: Todd Zullinger <tmz@pobox.com>
> ---

Makes sense.  Even though we internally still carry (and have to
carry) code to notice and explicitly reject "--set-upstream", I do
not think that we need to suggest its presence to the end user.

The option parsing code marks it with the PARSE_OPT_HIDDEN bit
correctly and it would make sense to make the synopsis section
follow suit.

Thanks.