gitweb: text files for 'blob_plain' action without charset by default

diff --git a/git-pull.sh b/git-pull.sh
index 17fda26721b7203faffd68bd178d5b757252d4d8..4611ae644e08e4ab115633ab86f1f02976663169 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -55,9 +55,17 @@ then
        # First update the working tree to match $curr_head.
 
        echo >&2 "Warning: fetch updated the current branch head."
-       echo >&2 "Warning: fast forwarding your working tree."
+       echo >&2 "Warning: fast forwarding your working tree from"
+       echo >&2 "Warning: $orig_head commit."
+       git-update-index --refresh 2>/dev/null
        git-read-tree -u -m "$orig_head" "$curr_head" ||
-               die "You need to first update your working tree."
+               die 'Cannot fast-forward your working tree.
+After making sure that you saved anything precious from
+$ git diff '$orig_head'
+output, run
+$ git reset --hard
+to recover.'
+
 fi
 
 merge_head=$(sed -e '/ not-for-merge   /d' \
@@ -70,14 +78,14 @@ case "$merge_head" in
        exit 0
        ;;
 ?*' '?*)
-       var=`git repo-config --get pull.octopus`
+       var=`git-repo-config --get pull.octopus`
        if test -n "$var"
        then
                strategy_default_args="-s $var"
        fi
        ;;
 *)
-       var=`git repo-config --get pull.twohead`
+       var=`git-repo-config --get pull.twohead`
        if test -n "$var"
         then
                strategy_default_args="-s $var"