Merge commit 'refs/top-bases/debian/locations' into debian/locations

diff --git a/debian/control b/debian/control
index fdb35fec80228a082f84a55896326f2650edbd65..bcdb294e7d41a7e31da5bc3995c6c250f58b1fd2 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Browser: http://git.debian.org/?p=collab-maint/topgit.git
 
 Package: topgit
 Architecture: all
-Depends: git-core
+Depends: git (>= 1:1.7) | git-core
 Suggests: git-email, make, quilt
 Description: a Git patch queue manager
  TopGit manages a patch queue using Git topic branches, one patch per

diff --git a/debian/tg2quilt.mk b/debian/tg2quilt.mk
index f83caa6701f95fb6b2a540c24e53ebb877b78a76..744b853a4e41a156748e41e6135851c38641eabc 100644 (file)
--- 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; \