Hello James,

On Thu, May 13, 2010 at 06:57:05PM -0400, James Vega wrote:
> Package: topgit
> Version: 0.8-1.1
> Severity: normal
> 
> $ debian/rules tg-cleanexport
> QUILT_PATCHES=debian/patches quilt pop -a 2>/dev/null || :
> error: unknown switch `a'
> usage: git status [options] [--] <filepattern>...
> 
>     -v, --verbose         be verbose
>     -s, --short           show status concisely
>     --porcelain           show porcelain output format
>     -z, --null            terminate entries with NUL
>     -u, --untracked-files[=<mode>]
>                           show untracked files, optional modes: all, normal, 
> no. (Default: all)

I don't know what was intended back then by the options passed to
git-status.  The patch below isn't tested, but it should do what I think
is intended there.

Best regards and thanks
Uwe

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; \

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to