X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=debian%2Ftg2quilt.mk;fp=debian%2Ftg2quilt.mk;h=744b853a4e41a156748e41e6135851c38641eabc;hp=f83caa6701f95fb6b2a540c24e53ebb877b78a76;hb=82f304a9d9a72111fde3127b15537f67df1d6612;hpb=566ea3fef82d408955285b2928b3f481486b809f diff --git a/debian/tg2quilt.mk b/debian/tg2quilt.mk index f83caa6..744b853 100644 --- a/debian/tg2quilt.mk +++ b/debian/tg2quilt.mk @@ -128,7 +128,8 @@ else echo "E: please unapply (pop) all patches and try again." >&2; \ false; \ fi - @if git status -am. >/dev/null; then \ + @git update-index -q --ignore-submodules --refresh + @if git diff-index --quiet --cached HEAD --ignore-submodules -- > /dev/null || git diff-files --quiet --ignore-submodules > /dev/null; then \ echo "E: there are uncommitted changes in the working directory." >&2; \ echo "E: please commit or revert all changes." >&2; \ false; \