[PATCH] Ignore dirty submodule states in "git pull --rebase"

Johannes Schindelin· Jul 22, 2008, 21:41 UTC · lore

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

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 git-pull.sh |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Show changes to git-pull.sh +3 −3

diff --git a/git-pull.sh b/git-pull.sh
index 6afd4e2..75c3610 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 &&

-- 
1.6.0.rc0.22.gf2096d.dirty

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