Hello James, On Sun, May 16, 2010 at 08:51:38AM +0200, Uwe Kleine-König wrote: > 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. Martin told me that git status used to take the same options as git commit. Reading the commit log of v1.7.0-rc0~137^2~17 [1] of git.git, an alternative is to substitute git status by git commit --dry-run.
> 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; \ > Did you test this patch and did it help? I'm a bit unsure what to prefer (i.e. my patch or s/status/commit --dry-run/). Thoughts? Best regards Uwe [1] http://git.kernel.org/?p=git/git.git;a=commit;h=9e4b7ab652561e1807702fe5288e04b8873fc437 -- 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
