summaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2008-07-22 21:41:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-07-23 18:36:56 (GMT)
commit7d90c8ee15d8dcb1450d1ffc2890e5341c963598 (patch)
treec60b5c9e4b23cab40ddbc90b9ba7399f8bcb3372 /git-pull.sh
parentc65233fe2c14ca10da847e49b54924c9a49498c5 (diff)
downloadgit-7d90c8ee15d8dcb1450d1ffc2890e5341c963598.zip
git-7d90c8ee15d8dcb1450d1ffc2890e5341c963598.tar.gz
git-7d90c8ee15d8dcb1450d1ffc2890e5341c963598.tar.bz2
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>
Diffstat (limited to 'git-pull.sh')
-rwxr-xr-xgit-pull.sh6
1 files changed, 3 insertions, 3 deletions
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 &&