From: Uwe Kleine-König Date: Sun, 16 May 2010 06:51:38 +0000 (+0200) Subject: tg2quilt.mk: don't call git-status with git-commit options X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=commitdiff_plain;h=82f304a9d9a72111fde3127b15537f67df1d6612 tg2quilt.mk: don't call git-status with git-commit options git-status older than v1.7.0-rc0~137^2~17 used to take the same options as git-commit. So reimplement the needed logic using plumbing. An alternative would be using git commit --dry-run. Signed-off-by: Uwe Kleine-König Tested-by: James Vega Closes: http://bugs.debian.org/581582 --- 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; \