X-Git-Url: https://git.octo.it/?p=git.git;a=blobdiff_plain;f=git-pull.sh;h=4611ae644e08e4ab115633ab86f1f02976663169;hp=6caf1aad471bbf8f894ea20a80c3be082012648b;hb=HEAD;hpb=cfac3f3fa7267c8c06372875f3b05311f0fe4346

diff --git a/git-pull.sh b/git-pull.sh
index 6caf1aad..4611ae64 100755
--- 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
 	;;