Skip to content

Commit 7d90c8e

Browse files
dschogitster
authored andcommitted
Ignore dirty submodule states in "git pull --rebase"
This is a companion patch to 6848d58(Ignore dirty submodule states during rebase and stash). Signed-off-by: Johannes Schindelin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent c65233f commit 7d90c8e

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

git-pull.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ error_on_no_merge_candidates () {
107107
}
108108

109109
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 -- ||
113113
die "refusing to pull with rebase: your working tree is not up-to-date"
114114

115115
. git-parse-remote &&

0 commit comments

Comments
 (0)