From cf46e7b8999f25d5d7f2acd64701a100e403ee03 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 22 Mar 2006 01:09:43 -0800 Subject: [PATCH 1/2] 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 --- git-pull.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/git-pull.sh b/git-pull.sh index 29c14e148e..d90f7c9676 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 From 8323124afe49353e09d041eb8ed3be4c2477c180 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 22 Mar 2006 01:57:11 -0800 Subject: [PATCH 2/2] git-pull: reword "impossible to fast-forward" message. Signed-off-by: Junio C Hamano --- git-pull.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/git-pull.sh b/git-pull.sh index d90f7c9676..4611ae644e 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -59,7 +59,13 @@ then 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' \