{"thread":{"id":"14601","subject":"[PATCH] Ignore dirty submodule states in \"git pull --rebase\"","startedAt":"2008-07-22T21:41:41Z","lastAt":"2008-07-22T21:41:41Z","messageCount":1,"participants":["Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"84381","messageId":"alpine.DEB.1.00.0807222241200.8986@racer","threadId":"14601","inReplyTo":null,"subject":"[PATCH] Ignore dirty submodule states in \"git pull --rebase\"","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-07-22T21:41:41Z","receivedAt":"2008-07-22T21:41:41Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nThis is a companion patch to 6848d58c(Ignore dirty submodule states\nduring rebase and stash).\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n git-pull.sh |    6 +++---\n 1 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/git-pull.sh b/git-pull.sh\nindex 6afd4e2..75c3610 100755\n--- a/git-pull.sh\n+++ b/git-pull.sh\n@@ -107,9 +107,9 @@ error_on_no_merge_candidates () {\n }\n \n test true = \"$rebase\" && {\n-\tgit update-index --refresh &&\n-\tgit diff-files --quiet &&\n-\tgit diff-index --cached --quiet HEAD -- ||\n+\tgit update-index --ignore-submodules --refresh &&\n+\tgit diff-files --ignore-submodules --quiet &&\n+\tgit diff-index --ignore-submodules --cached --quiet HEAD -- ||\n \tdie \"refusing to pull with rebase: your working tree is not up-to-date\"\n \n \t. git-parse-remote &&\n-- \n1.6.0.rc0.22.gf2096d.dirty\n"}]}