From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Sep 2012 22:43:07 +0000 (-0700)
Subject: Merge branch 'cn/branch-set-upstream-to'
X-Git-Tag: v1.8.0-rc0~83
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=83ce1764496d90a5ef45b0a109ab5fc222a62199;p=git.git

Merge branch 'cn/branch-set-upstream-to'

"git branch --set-upstream origin/master" is a common mistake to
create a local branch 'origin/master' and set it to integrate with
the current branch.  With a plan to deprecate this option, introduce
"git branch (-u|--set-upstream-to) origin/master" that sets the
current branch to integrate with 'origin/master' remote tracking
branch.

* cn/branch-set-upstream-to:
  branch: deprecate --set-upstream and show help if we detect possible mistaken use
  branch: add --unset-upstream option
  branch: introduce --set-upstream-to
---

83ce1764496d90a5ef45b0a109ab5fc222a62199
diff --cc builtin/branch.c
index 297be4ec4,5e95e3568..e61b0ece2
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@@ -720,20 -719,22 +721,22 @@@ int cmd_branch(int argc, const char **a
  	struct commit_list *with_commit = NULL;
  
  	struct option options[] = {
 -		OPT_GROUP("Generic options"),
 +		OPT_GROUP(N_("Generic options")),
  		OPT__VERBOSE(&verbose,
 -			"show hash and subject, give twice for upstream branch"),
 -		OPT__QUIET(&quiet, "suppress informational messages"),
 -		OPT_SET_INT('t', "track",  &track, "set up tracking mode (see git-pull(1))",
 +			N_("show hash and subject, give twice for upstream branch")),
 +		OPT__QUIET(&quiet, N_("suppress informational messages")),
 +		OPT_SET_INT('t', "track",  &track, N_("set up tracking mode (see git-pull(1))"),
  			BRANCH_TRACK_EXPLICIT),
 -		OPT_SET_INT( 0, "set-upstream",  &track, "change upstream info",
 +		OPT_SET_INT( 0, "set-upstream",  &track, N_("change upstream info"),
  			BRANCH_TRACK_OVERRIDE),
+ 		OPT_STRING('u', "set-upstream-to", &new_upstream, "upstream", "change the upstream info"),
+ 		OPT_BOOLEAN(0, "unset-upstream", &unset_upstream, "Unset the upstream info"),
 -		OPT__COLOR(&branch_use_color, "use colored output"),
 -		OPT_SET_INT('r', "remotes",     &kinds, "act on remote-tracking branches",
 +		OPT__COLOR(&branch_use_color, N_("use colored output")),
 +		OPT_SET_INT('r', "remotes",     &kinds, N_("act on remote-tracking branches"),
  			REF_REMOTE_BRANCH),
  		{
 -			OPTION_CALLBACK, 0, "contains", &with_commit, "commit",
 -			"print only branches that contain the commit",
 +			OPTION_CALLBACK, 0, "contains", &with_commit, N_("commit"),
 +			N_("print only branches that contain the commit"),
  			PARSE_OPT_LASTARG_DEFAULT,
  			parse_opt_with_commit, (intptr_t)"HEAD",
  		},