diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-03-22 01:09:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-22 01:09:43 -0800 |
| commit | cf46e7b8999f25d5d7f2acd64701a100e403ee03 (patch) | |
| tree | 1d6adc6418f3aa80a4454d2c3efb63bcf97a5d8f | |
| parent | git-apply: do not barf when updating an originally empty file. (diff) | |
| download | git-cf46e7b8999f25d5d7f2acd64701a100e403ee03.tar.gz git-cf46e7b8999f25d5d7f2acd64701a100e403ee03.zip | |
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>
| -rwxr-xr-x | git-pull.sh | 4 |
1 files changed, 3 insertions, 1 deletions
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 |