releasing version 0.19

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 3a729e4ab12dafffad6ca8e01cb6bd29eb9044cd..079af5273eb5c48fd56247c69f1f03e0aa905be3 100755 (executable)
--- a/mr
+++ b/mr
@@ -1166,7 +1166,12 @@ git_bare_test =
        test "`GIT_CONFIG="$MR_REPO"/config git config --get core.bare`" = true
 
 svn_update = svn update "$@"
        test "`GIT_CONFIG="$MR_REPO"/config git config --get core.bare`" = true
 
 svn_update = svn update "$@"

-git_update = if [ "$@" ]; then git pull "$@"; else git pull -t origin master; fi
+git_update =
+       if [ "$@" ]; then
+               git pull "$@"
+       else
+               git pull
+       fi

 bzr_update = bzr merge "$@"
 cvs_update = cvs update "$@"
 hg_update  = hg pull "$@" && hg update "$@"
 bzr_update = bzr merge "$@"
 cvs_update = cvs update "$@"
 hg_update  = hg pull "$@" && hg update "$@"


@@ -1250,7 +1255,10 @@ help =
        if [ ! -e "$MR_PATH" ]; then
                error "cannot find program path"
        fi
        if [ ! -e "$MR_PATH" ]; then
                error "cannot find program path"
        fi

-       (pod2man -c mr "$MR_PATH" | man -l -) || error "pod2man or man failed"
+       tmp=$(mktemp -t mr.XXXXXXXXXX) || error "mktemp failed"
+       trap "rm -f $tmp" exit
+       pod2man -c mr "$MR_PATH" > "$tmp" || error "pod2man failed"
+       man -l "$tmp" || error "man failed"

 list = true
 config = 
 
 list = true
 config =