commit: allow --amend to reuse message from another commit

[git.git] / git-browse-help.sh

diff --git a/git-browse-help.sh b/git-browse-help.sh
index 76eff01bab707f76a147160e55430868ae3dce97..b465911c9a418d79f5ff592d9c409b70d92d49e9 100755 (executable)
--- a/git-browse-help.sh
+++ b/git-browse-help.sh
@@ -17,8 +17,10 @@
 #
 
 USAGE='[--browser=browser|--tool=browser] [cmd to display] ...'
-SUBDIRECTORY_OK=Yes
-OPTIONS_SPEC=
+
+# This must be capable of running outside of git directory, so
+# the vanilla git-sh-setup should not be used.
+NONGIT_OK=Yes
 . git-sh-setup
 
 # Install data.
@@ -37,7 +39,7 @@ valid_tool() {
 }
 
 init_browser_path() {
-       browser_path=`git config browser.$1.path`
+       test -z "$GIT_DIR" || browser_path=`git config browser.$1.path`
        test -z "$browser_path" && browser_path=$1
 }
 
@@ -69,10 +71,15 @@ do
     shift
 done
 
-if test -z "$browser"; then
-    browser=`git config web.browser`
+if test -z "$browser" && test -n "$GIT_DIR"
+then
+    for opt in "help.browser" "web.browser"
+    do
+       browser="`git config $opt`"
+       test -z "$browser" || break
+    done
     if test -n "$browser" && ! valid_tool "$browser"; then
-           echo >&2 "git config option web.browser set to unknown browser: $browser"
+           echo >&2 "git config option $opt set to unknown browser: $browser"
            echo >&2 "Resetting to default..."
            unset browser
     fi
@@ -87,7 +94,7 @@ if test -z "$browser" ; then
     else
        browser_candidates="w3m links lynx"
     fi
-    echo "browser candidates: $browser_candidates"
+
     for i in $browser_candidates; do
        init_browser_path $i
        if type "$browser_path" > /dev/null 2>&1; then