diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-11-29 17:52:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-29 17:52:32 -0800 |
| commit | e4663556cfa0d85e7a80d731b07d4058335761ff (patch) | |
| tree | 141596683079fc76435465f3de992a7ddd51abe0 /git-pull.sh | |
| parent | 4ef927a995d9b54b37e4cff8ed7cd92764d4dacd (diff) | |
| parent | 92c62a3f4f93432c0c82e3031a9e64e03ba290f7 (diff) | |
| download | git-e4663556cfa0d85e7a80d731b07d4058335761ff.tar.xz | |
Merge branch 'rr/needs-clean-work-tree'
* rr/needs-clean-work-tree:
Porcelain scripts: Rewrite cryptic "needs update" error message
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/git-pull.sh b/git-pull.sh index 8eb74d45de..20a3bbea07 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -201,10 +201,7 @@ test true = "$rebase" && { die "updating an unborn branch with changes added to the index" fi else - git update-index --ignore-submodules --refresh && - git diff-files --ignore-submodules --quiet && - git diff-index --ignore-submodules --cached --quiet HEAD -- || - die "refusing to pull with rebase: your working tree is not up-to-date" + require_clean_work_tree "pull with rebase" "Please commit or stash them." fi oldremoteref= && . git-parse-remote && |