From: Kaartic Sivaraam <kaarticsivaraam91196@gmail.com>
Date: Thu, 17 Aug 2017 02:54:24 +0000 (+0530)
Subject: builtin/branch: stop supporting the "--set-upstream" option
X-Git-Tag: v2.16.0-rc0~82^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/52668846ea2d41ffbd87cda7cb8e492dea9f2c4d?hp=52668846ea2d41ffbd87cda7cb8e492dea9f2c4d

builtin/branch: stop supporting the "--set-upstream" option

The '--set-upstream' option of branch was deprecated in b347d06b
("branch: deprecate --set-upstream and show help if we detect
possible mistaken use", 2012-08-30) and has been planned for removal
ever since.

In order to prevent "--set-upstream" on a command line from being taken as
an abbreviated form of "--set-upstream-to", explicitly catch "--set-upstream"
option and die, instead of just removing it from the list of options.

Before this change, an attempt to use "--set-upstream" resulted in:

$ git branch
* master

$ git branch --set-upstream origin/master
The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to
Branch origin/master set up to track local branch master.

$ echo $?
0

$ git branch
* master
origin/master

With this change, the behaviour becomes like this:

$ git branch
* master

$ git branch --set-upstream origin/master
fatal: the '--set-upstream' option is no longer supported. Please use '--track' or '--set-upstream-to' instead.

$ echo $?
128

$ git branch
* master

Signed-off-by: Kaartic Sivaraam <kaarticsivaraam91196@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---