Merge branch 'js/diff'

diff --git a/git-pull.sh b/git-pull.sh
index 6caf1aad471bbf8f894ea20a80c3be082012648b..bdd3939923bb905d561eb3ca88bda729cc93660d 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,20 +78,16 @@ case "$merge_head" in
        exit 0
        ;;
 ?*' '?*)
-       var=`git repo-config --get pull.octopus`
-       if test '' = "$var"
+       var=`git-repo-config --get pull.octopus`
+       if test -n "$var"
        then
-               strategy_default_args='-s octopus'
-       else
                strategy_default_args="-s $var"
        fi
        ;;
 *)
-       var=`git repo-config --get pull.twohead`
-       if test '' = "$var"
-       then
-               strategy_default_args='-s recursive'
-       else
+       var=`git-repo-config --get pull.twohead`
+       if test -n "$var"
+        then
                strategy_default_args="-s $var"
        fi
        ;;
@@ -95,5 +99,5 @@ case "$strategy_args" in
        ;;
 esac
 
-merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD")
+merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") || exit
 git-merge $no_summary $no_commit $strategy_args "$merge_name" HEAD $merge_head