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>
Johannes Schindelin committed
Jul 22, 2008 at 22:41 UTC
7d90c8ee15d8dcb1450d1ffc2890e5341c963598
1 file changed
+3
-3
git-pull.sh
+3
-3
@@ -107,9 +107,9 @@ error_on_no_merge_candidates () {
107
}
108
109
test true = "$rebase" && {
110
- git update-index --refresh &&
111
- git diff-files --quiet &&
112
- git diff-index --cached --quiet HEAD -- ||
110
+ git update-index --ignore-submodules --refresh &&
111
+ git diff-files --ignore-submodules --quiet &&
112
+ git diff-index --ignore-submodules --cached --quiet HEAD -- ||
113
die "refusing to pull with rebase: your working tree is not up-to-date"
114
115
. git-parse-remote &&