Skip to content

Commit

Permalink
git-pull: further safety while on tracking branch.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Mar 22, 2006
1 parent 3103cf9 commit cf46e7b
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion git-pull.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit cf46e7b

Please sign in to comment.