diff options
| author |  Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2008-07-22 22:41:41 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-07-23 11:36:56 -0700 |
| commit | 7d90c8ee15d8dcb1450d1ffc2890e5341c963598 (patch) | |
| tree | c60b5c9e4b23cab40ddbc90b9ba7399f8bcb3372 | |
| parent | t/t4202-log.sh: add newline at end of file (diff) | |
| download | tgif-7d90c8ee15d8dcb1450d1ffc2890e5341c963598.tar.xz | |
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>
| -rwxr-xr-x | git-pull.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-pull.sh b/git-pull.sh index 6afd4e2f4e..75c36100a2 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 && |