On Sat, Dec 15, 2007 at 11:26:44AM -0800, Junio C Hamano wrote:
> > Although I would have called it "git-help--browse" rather than
> > "git-browse--help" since
>
> Good point.
And here is the patch (I based the change-sites off of the ones in your
previous patch, plus a grep to double-check).
-- >8 --
rename git-browse--help to git-help--browse
The convention for helper scripts has been
git-$TOOL--$HELPER. Since this is a "browse" helper for the
"help" tool, git-help--browse is a more sensible name.
Signed-off-by: Jeff King <peff@xxxxxxxx>
---
.gitignore | 2 +-
Documentation/git-help.txt | 4 ++--
Makefile | 2 +-
git-browse--help.sh => git-help--browse.sh | 0
help.c | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
rename git-browse--help.sh => git-help--browse.sh (100%)
diff --git a/.gitignore b/.gitignore
index aef01c5..dab5bc2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,6 @@ git-archive
git-bisect
git-blame
git-branch
-git-browse--help
git-bundle
git-cat-file
git-check-attr
@@ -52,6 +51,7 @@ git-gc
git-get-tar-commit-id
git-grep
git-hash-object
+git-help--browse
git-http-fetch
git-http-push
git-imap-send
diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt
index 8cd69e7..da3f718 100644
--- a/Documentation/git-help.txt
+++ b/Documentation/git-help.txt
@@ -47,13 +47,13 @@ OPTIONS
+
The web browser can be specified using the configuration variable
'help.browser', or 'web.browser' if the former is not set. If none of
-these config variables is set, the 'git-browse--help' helper script
+these config variables is set, the 'git-help--browse' helper script
(called by 'git-help') will pick a suitable default.
+
You can explicitly provide a full path to your prefered browser by
setting the configuration variable 'browser.<tool>.path'. For example,
you can configure the absolute path to firefox by setting
-'browser.firefox.path'. Otherwise, 'git-browse--help' assumes the tool
+'browser.firefox.path'. Otherwise, 'git-help--browse' assumes the tool
is available in PATH.
+
Note that the script tries, as much as possible, to display the HTML
diff --git a/Makefile b/Makefile
index 62f1893..7776077 100644
--- a/Makefile
+++ b/Makefile
@@ -227,7 +227,7 @@ SCRIPT_SH = \
git-lost-found.sh git-quiltimport.sh git-submodule.sh \
git-filter-branch.sh \
git-stash.sh \
- git-browse--help.sh
+ git-help--browse.sh
SCRIPT_PERL = \
git-add--interactive.perl \
diff --git a/git-browse--help.sh b/git-help--browse.sh
similarity index 100%
rename from git-browse--help.sh
rename to git-help--browse.sh
diff --git a/help.c b/help.c
index f9ce6db..1302a61 100644
--- a/help.c
+++ b/help.c
@@ -331,7 +331,7 @@ static void show_info_page(const char *git_cmd)
static void show_html_page(const char *git_cmd)
{
const char *page = cmd_to_page(git_cmd);
- execl_git_cmd("browse--help", page, NULL);
+ execl_git_cmd("help--browse", page, NULL);
}
void help_unknown_cmd(const char *cmd)
--
1.5.4.rc0.1122.g899d-dirty
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
