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

From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Jul 10, 2012, 17:08 UTC
Message-ID: <vpq394zo86k.fsf@bauges.imag.fr>
In-Reply-To: <1341939181-8962-2-git-send-email-cmn@elego.de>

Carlos Martín Nieto <cmn@elego.de> writes:

> The new options allows us to type
>
>     git branch --set-upstream-to origin/master

This is cool :-).

>  Documentation/git-branch.txt |    9 ++++++++-
>  builtin/branch.c             |   15 +++++++++++++--

I think this deserves a few new tests (probably in t/t3200-branch.sh).

Show 5 quoted lines

> +-u <upstream>::
> +--set-upstream-to=<upstream>::
> +	Set up <branchname>'s tracking information so <upstream> is
> +	considered <branchname>'s upstream branch. If no branch is
> +	specified it defaults to the current branch.

Perhaps "if <branchname> is not specified, then it defaults to the current branch.". The current wording does not make it very clear if "no branch is specified" refers to <branchname> or <upstream> (although the second option would be plain silly).

Show 5 quoted lines

> +	} else if (new_upstream) {
> +		struct branch *branch = branch_get(argv[0]);
> +
> +		if (!ref_exists(branch->refname))
> +		  die(_("branch '%s' does not exist"), branch->name);

Indentation (2 spaces -> tab).

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/