From 82f304a9d9a72111fde3127b15537f67df1d6612 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Sun, 16 May 2010 08:51:38 +0200 Subject: [PATCH] tg2quilt.mk: don't call git-status with git-commit options MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- debian/tg2quilt.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; \ -- 2.30.2