On 10.03.2014 20:04, TamerTas wrote:
>
> Signed-off-by: TamerTas <tamer...@outlook.com>
> ---
> branch.c | 31 ++++++++-----------------------
> 1 file changed, 8 insertions(+), 23 deletions(-)
>
> diff --git a/branch.c b/branch.c
> index 723a36b..397edd3 100644
> --- a/branch.c
> +++ b/branch.c
> @@ -50,6 +50,9 @@ static int should_setup_rebase(const char *origin)
> void install_branch_config(int flag, const char *local, const char *origin,
> const char *remote)
> {
> const char *shortname = remote + 11;
> + const char *location[] = {"local", "remote"};
> + const char *type[] = {"branch", "ref"};
> +
> int remote_is_branch = starts_with(remote, "refs/heads/");
> struct strbuf key = STRBUF_INIT;
> int rebasing = should_setup_rebase(origin);
> @@ -77,29 +80,11 @@ void install_branch_config(int flag, const char *local,
> const char *origin, cons
> strbuf_release(&key);
>
> if (flag & BRANCH_CONFIG_VERBOSE) {
> - if (remote_is_branch && origin)
> - printf_ln(rebasing ?
> - _("Branch %s set up to track remote branch %s
> from %s by rebasing.") :
> - _("Branch %s set up to track remote branch %s
> from %s."),
> - local, shortname, origin);
> - else if (remote_is_branch && !origin)
> - printf_ln(rebasing ?
> - _("Branch %s set up to track local branch %s
> by rebasing.") :
> - _("Branch %s set up to track local branch
> %s."),
> - local, shortname);
> - else if (!remote_is_branch && origin)
> - printf_ln(rebasing ?
> - _("Branch %s set up to track remote ref %s by
> rebasing.") :
> - _("Branch %s set up to track remote ref %s."),
> - local, remote);
> - else if (!remote_is_branch && !origin)
> - printf_ln(rebasing ?
> - _("Branch %s set up to track local ref %s by
> rebasing.") :
> - _("Branch %s set up to track local ref %s."),
> - local, remote);
> - else
> - die("BUG: impossible combination of %d and %p",
> - remote_is_branch, origin);
> +
> + printf_ln(rebasing ?
> + _("Branch %s set up to track %s %s %s by rebasing.") :
> + _("Branch %s set up to track %s %s %s."),
> + local, location[!origin], type[remote_is_branch], remote);
> }
> }
>
>
This one is neat, I'd favor this one as opposed to the one posted
earlier today.
Acked-by: Stefan Beller <stefanbel...@googlemail.com>
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
