X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=debian%2Ftg2quilt.mk;h=744b853a4e41a156748e41e6135851c38641eabc;hp=1a8893acfc1c42e6cb23f4818d61224d4e87c33c;hb=82f304a9d9a72111fde3127b15537f67df1d6612;hpb=94611051596fecc43cdd89e221d15d161c49e348

diff --git a/debian/tg2quilt.mk b/debian/tg2quilt.mk
index 1a8893a..744b853 100644
--- a/debian/tg2quilt.mk
+++ b/debian/tg2quilt.mk
@@ -122,13 +122,14 @@ else
   tg-rmdir: __TG_FILES := $(shell find $(QUILT_PATCH_DIR) -type f -a -not -path \*/series \
                                     | xargs grep -l '^tg:')
   tg-rmdir:
-	QUILT_PATCHES=$(QUILT_PATCH_DIR) quilt pop -a
+	QUILT_PATCHES=$(QUILT_PATCH_DIR) quilt pop -a 2>/dev/null || :
 	@if quilt applied >/dev/null 2>&1; then \
 	  echo "E: there are applied quilt patches." >&2; \
 	  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; \
@@ -161,7 +162,7 @@ tg-cleanexport: tg-rmdir
 
 endif
 
-.PHONY: tg-clean tg-export tg-forceclean tg-rmdir
+.PHONY: tg-clean tg-export tg-forceclean tg-rmdir tg-cleanexport
 
 # vim:ft=make:ts=8:noet
 # -*- Makefile -*-, you silly Emacs! (shamelessly stolen from quilt)