X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=git-pull.sh;h=20a3bbea07c259ec1f19353b2888fde20e8b67da;hb=657072f3ac5519f146a947253c9959909b38c293;hp=8eb74d45debe7ab2bd2cc9b5ed57b1ba49d94bdb;hpb=e24058f57f4e76e38e20390c5927590f3cd48085;p=~andy%2Fgit

diff --git a/git-pull.sh b/git-pull.sh
index 8eb74d45d..20a3bbea0 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 &&