From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Sep 2017 06:24:07 +0000 (+0900)
Subject: Merge branch 'ks/help-alias-label'
X-Git-Tag: v2.15.0-rc0~67
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5079cc82cbcdb204b978c2fceab3d96cfe78e0e5?hp=-c

Merge branch 'ks/help-alias-label'

"git help co" now says "co is aliased to ...", not "git co is".

* ks/help-alias-label:
help: change a message to be more precise
---

5079cc82cbcdb204b978c2fceab3d96cfe78e0e5
diff --combined builtin/help.c
index b3f60a8f30,dbe45c5962..d3c8fc4082
--- a/builtin/help.c
+++ b/builtin/help.c
@@@ -131,7 -131,6 +131,7 @@@ static void exec_woman_emacs(const cha
  		strbuf_addf(&man_page, "(woman \"%s\")", page);
  		execlp(path, "emacsclient", "-e", man_page.buf, (char *)NULL);
  		warning_errno(_("failed to exec '%s'"), path);
 +		strbuf_release(&man_page);
  	}
  }
  
@@@ -153,7 -152,6 +153,7 @@@ static void exec_man_konqueror(const ch
  		strbuf_addf(&man_page, "man:%s(1)", page);
  		execlp(path, filename, "newTab", man_page.buf, (char *)NULL);
  		warning_errno(_("failed to exec '%s'"), path);
 +		strbuf_release(&man_page);
  	}
  }
  
@@@ -171,7 -169,6 +171,7 @@@ static void exec_man_cmd(const char *cm
  	strbuf_addf(&shell_cmd, "%s %s", cmd, page);
  	execl(SHELL_PATH, SHELL_PATH, "-c", shell_cmd.buf, (char *)NULL);
  	warning(_("failed to exec '%s'"), cmd);
 +	strbuf_release(&shell_cmd);
  }
  
  static void add_man_viewer(const char *name)
@@@ -441,7 -438,7 +441,7 @@@ static const char *check_git_cmd(const 
  
  	alias = alias_lookup(cmd);
  	if (alias) {
- 		printf_ln(_("`git %s' is aliased to `%s'"), cmd, alias);
+ 		printf_ln(_("'%s' is aliased to '%s'"), cmd, alias);
  		free(alias);
  		exit(0);
  	}