Merge branch 'ks/help-alias-label' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Sep 2017 03:52:27 +0000 (12:52 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Sep 2017 03:52:27 +0000 (12:52 +0900)
"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

1  2 
builtin/help.c
diff --combined builtin/help.c
index b3f60a8f30b39e9731fcde08600c900b2f772acb,dbe45c5962890f32a0e0dccff809a33c87c4e32d..d3c8fc40820faa10f7c9004560159986b2900e9e
@@@ -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);
        }