From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Jun 2015 19:00:29 +0000 (-0700)
Subject: Merge branch 'dl/branch-error-message' into maint
X-Git-Tag: v2.4.3~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cbac7067a406380dd0061ecdd990a5e64ca88abf?ds=inline;hp=-c

Merge branch 'dl/branch-error-message' into maint

Error messages from "git branch" called remote-tracking branches as
"remote branches".

* dl/branch-error-message:
branch: do not call a "remote-tracking branch" a "remote branch"
---

cbac7067a406380dd0061ecdd990a5e64ca88abf
diff --combined builtin/branch.c
index 1d150378e9,68ac4c4e9f..a0a03fc6de
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@@ -21,10 -21,10 +21,10 @@@
  #include "wt-status.h"
  
  static const char * const builtin_branch_usage[] = {
 -	N_("git branch [options] [-r | -a] [--merged | --no-merged]"),
 -	N_("git branch [options] [-l] [-f] <branchname> [<start-point>]"),
 -	N_("git branch [options] [-r] (-d | -D) <branchname>..."),
 -	N_("git branch [options] (-m | -M) [<oldbranch>] <newbranch>"),
 +	N_("git branch [<options>] [-r | -a] [--merged | --no-merged]"),
 +	N_("git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"),
 +	N_("git branch [<options>] [-r] (-d | -D) <branch-name>..."),
 +	N_("git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"),
  	NULL
  };
  
@@@ -242,7 -242,7 +242,7 @@@ static int delete_branches(int argc, co
  					    sha1, &flags);
  		if (!target) {
  			error(remote_branch
- 			      ? _("remote branch '%s' not found.")
+ 			      ? _("remote-tracking branch '%s' not found.")
  			      : _("branch '%s' not found."), bname.buf);
  			ret = 1;
  			continue;
@@@ -257,7 -257,7 +257,7 @@@
  
  		if (delete_ref(name, sha1, REF_NODEREF)) {
  			error(remote_branch
- 			      ? _("Error deleting remote branch '%s'")
+ 			      ? _("Error deleting remote-tracking branch '%s'")
  			      : _("Error deleting branch '%s'"),
  			      bname.buf);
  			ret = 1;
@@@ -265,7 -265,7 +265,7 @@@
  		}
  		if (!quiet) {
  			printf(remote_branch
- 			       ? _("Deleted remote branch %s (was %s).\n")
+ 			       ? _("Deleted remote-tracking branch %s (was %s).\n")
  			       : _("Deleted branch %s (was %s).\n"),
  			       bname.buf,
  			       (flags & REF_ISBROKEN) ? "broken"
@@@ -589,16 -589,9 +589,16 @@@ static char *get_head_description(void
  	else if (state.bisect_in_progress)
  		strbuf_addf(&desc, _("(no branch, bisect started on %s)"),
  			    state.branch);
 -	else if (state.detached_from)
 -		strbuf_addf(&desc, _("(detached from %s)"),
 -			    state.detached_from);
 +	else if (state.detached_from) {
 +		/* TRANSLATORS: make sure these match _("HEAD detached at ")
 +		   and _("HEAD detached from ") in wt-status.c */
 +		if (state.detached_at)
 +			strbuf_addf(&desc, _("(HEAD detached at %s)"),
 +				state.detached_from);
 +		else
 +			strbuf_addf(&desc, _("(HEAD detached from %s)"),
 +				state.detached_from);
 +	}
  	else
  		strbuf_addstr(&desc, _("(no branch)"));
  	free(state.branch);
@@@ -807,7 -800,7 +807,7 @@@ static int edit_branch_description(cons
  
  int cmd_branch(int argc, const char **argv, const char *prefix)
  {
 -	int delete = 0, rename = 0, force_create = 0, list = 0;
 +	int delete = 0, rename = 0, force = 0, list = 0;
  	int verbose = 0, abbrev = -1, detached = 0;
  	int reflog = 0, edit_description = 0;
  	int quiet = 0, unset_upstream = 0;
@@@ -855,7 -848,7 +855,7 @@@
  		OPT_BOOL('l', "create-reflog", &reflog, N_("create the branch's reflog")),
  		OPT_BOOL(0, "edit-description", &edit_description,
  			 N_("edit the description for the branch")),
 -		OPT__FORCE(&force_create, N_("force creation (when already exists)")),
 +		OPT__FORCE(&force, N_("force creation, move/rename, deletion")),
  		{
  			OPTION_CALLBACK, 0, "no-merged", &merge_filter_ref,
  			N_("commit"), N_("print only not merged branches"),
@@@ -898,7 -891,7 +898,7 @@@
  	if (with_commit || merge_filter != NO_FILTER)
  		list = 1;
  
 -	if (!!delete + !!rename + !!force_create + !!new_upstream +
 +	if (!!delete + !!rename + !!new_upstream +
  	    list + unset_upstream > 1)
  		usage_with_options(builtin_branch_usage, options);
  
@@@ -911,11 -904,6 +911,11 @@@
  		colopts = 0;
  	}
  
 +	if (force) {
 +		delete *= 2;
 +		rename *= 2;
 +	}
 +
  	if (delete) {
  		if (!argc)
  			die(_("branch name required"));
@@@ -1032,7 -1020,7 +1032,7 @@@
  
  		branch_existed = ref_exists(branch->refname);
  		create_branch(head, argv[0], (argc == 2) ? argv[1] : head,
 -			      force_create, reflog, 0, quiet, track);
 +			      force, reflog, 0, quiet, track);
  
  		/*
  		 * We only show the instructions if the user gave us