Merge branch 'maint'

[git.git] / git-pull.sh

diff --git a/git-pull.sh b/git-pull.sh
index a5ab19538cec365d1c7bfab5059c04b341a376aa..eb87f49062b70d707adebca4013809822123608b 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -207,10 +207,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 &&