X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-submodule.sh;h=d9950c2b7fadef0876867e11ef26283ca1cfaf1e;hb=334fba656b50c92345586970bc6b100a449e1fc5;hp=8c562a72e6e95fce60b78c015623212b7fce1dab;hpb=1ba5c532e1f6ede63fd46bf6b647e70baa10a364;p=git.git diff --git a/git-submodule.sh b/git-submodule.sh index 8c562a72e..d9950c2b7 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -580,7 +580,7 @@ cmd_summary() { cd_to_toplevel # Get modified modules cared by user - modules=$(git $diff_cmd $cached --raw $head -- "$@" | + modules=$(git $diff_cmd $cached --ignore-submodules=dirty --raw $head -- "$@" | sane_egrep '^:([0-7]* )?160000' | while read mod_src mod_dst sha1_src sha1_dst status name do @@ -594,7 +594,7 @@ cmd_summary() { test -z "$modules" && return - git $diff_cmd $cached --raw $head -- $modules | + git $diff_cmd $cached --ignore-submodules=dirty --raw $head -- $modules | sane_egrep '^:([0-7]* )?160000' | cut -c2- | while read mod_src mod_dst sha1_src sha1_dst status name @@ -760,7 +760,7 @@ cmd_status() continue; fi set_name_rev "$path" "$sha1" - if git diff-files --quiet -- "$path" + if git diff-files --ignore-submodules=dirty --quiet -- "$path" then say " $sha1 $displaypath$revname" else