From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Tue, 22 Jul 2008 21:41:41 +0000 (+0100)
Subject: Ignore dirty submodule states in "git pull --rebase"
X-Git-Tag: v1.6.0-rc1~66
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7d90c8ee15d8dcb1450d1ffc2890e5341c963598;p=git.git

Ignore dirty submodule states in "git pull --rebase"

This is a companion patch to 6848d58c(Ignore dirty submodule states
during rebase and stash).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-pull.sh b/git-pull.sh
index 6afd4e2f4..75c36100a 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -107,9 +107,9 @@ error_on_no_merge_candidates () {
 }
 
 test true = "$rebase" && {
-	git update-index --refresh &&
-	git diff-files --quiet &&
-	git diff-index --cached --quiet HEAD -- ||
+	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"
 
 	. git-parse-remote &&