From 94611051596fecc43cdd89e221d15d161c49e348 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Fri, 6 Nov 2009 10:32:53 +0100 Subject: [PATCH] check for applied patches/uncommitted changes before tg-rmdir Signed-off-by: martin f. krafft --- debian/tg2quilt.mk | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/debian/tg2quilt.mk b/debian/tg2quilt.mk index 70ad402..1a8893a 100644 --- a/debian/tg2quilt.mk +++ b/debian/tg2quilt.mk @@ -31,7 +31,9 @@ # target, and invokes tg-rmdir # # tg-rmdir: tries to remove debian/patches, but only if there are no -# non-TopGit files under the directory. +# non-TopGit files under the directory, the repository has +# no uncommitted changes, and there are not quilt patches +# applied. # The heuristic is to find files that do not contain a line # matchines /^tg:/, minus the series file. If any such files # are found, an error occurs. Otherwise, the directory is @@ -120,6 +122,17 @@ 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 + @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 \ + echo "E: there are uncommitted changes in the working directory." >&2; \ + echo "E: please commit or revert all changes." >&2; \ + false; \ + fi # remove all files whose contents matches /^tg:/ rm -f $(__TG_FILES) # remove the series file -- 2.30.2