From: Junio C Hamano <junkio@cox.net>
Date: Wed, 22 Mar 2006 09:09:43 +0000 (-0800)
Subject: git-pull: further safety while on tracking branch.
X-Git-Tag: v1.3.0-rc1~10^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=cf46e7b8999f25d5d7f2acd64701a100e403ee03;p=git.git

git-pull: further safety while on tracking branch.

Running 'git pull' while on the tracking branch has a built-in
safety valve to fast-forward the index and working tree to match
the branch head, but it errs on the safe side too cautiously.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-pull.sh b/git-pull.sh
index 29c14e148..d90f7c967 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -55,7 +55,9 @@ 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."
 fi