Re: [PATCH 1/3] branch: introduce --set-upstream-to

Junio C Hamano [off-list ref] writes:

Ralf Thielow [off-list ref] writes:

quoted

On Fri, Aug 31, 2012 at 5:22 PM, Carlos Martín Nieto [off-list ref] wrote:

quoted

Ralf Thielow [off-list ref] writes:

quoted

On Thu, Aug 30, 2012 at 7:23 PM, Carlos Martín Nieto [off-list ref] wrote:

quoted

behaviour. To work around this, introduce --set-upstream-to which
accepts a compulsory argument indicating what the new upstream branch
should be and one optinal argument indicating which branch to change,
defaulting to HEAD.

Could you please also add this new option to the
"contrib/completion/git-completion.bash"
script?

If I knew how those things work... Is this enough?

Yes, Thanks.

While you are at it, perhaps you may want to unadvertise --set-upstream?

Yeah, that'd be good.

   cmn

--8<--
Subject: [PATCH] completion: add --set-upstream-to and --unset-upstream

Remove --set-upstream as it's deprecated now.
---
 contrib/completion/git-completion.bash | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index ffedce7..4a4d30a 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash

@@ -879,7 +879,8 @@ _git_branch ()
 		__gitcomp "
 			--color --no-color --verbose --abbrev= --no-abbrev
 			--track --no-track --contains --merged --no-merged
-			--set-upstream --edit-description --list
+			--set-upstream-to= --edit-description --list
+			--unset-upstream
 			"
 		;;
 	*)

-- 
1.7.12.3.g0dd8ef6