X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=87ab8625018c0d5ad47e576d7b27a3c832152704;hb=dd2e4ce5738b2a41b4a18d7a8ff87a32692a2aac;hp=37d38618572b90ce5514941021ff00355059dc48;hpb=70b522e712e52444e8c7b924502380d6413040fa;p=dgit.git

diff --git a/dgit b/dgit
index 37d38618..87ab8625 100755
--- a/dgit
+++ b/dgit
@@ -102,7 +102,7 @@ our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
 
 our $suite_re = '[-+.0-9a-z]+';
 our $cleanmode_re = qr{(?: dpkg-source (?: -d )? (?: ,no-check | ,all-check )?
-                         | git | git-ff
+                     | (?: git | git-ff ) (?: ,always )?
                          | check (?: ,ignores )?
                          | none
                          )}x;
@@ -6213,13 +6213,14 @@ sub maybe_unapply_patches_again () {
 
 #----- other building -----
 
-sub clean_tree_check_git ($$) {
-    my ($honour_ignores, $message) = @_;
+sub clean_tree_check_git ($$$) {
+    my ($honour_ignores, $message, $ignmessage) = @_;
     my @cmd = (@git, qw(clean -dn));
     push @cmd, qw(-x) unless $honour_ignores;
     my $leftovers = cmdoutput @cmd;
     if (length $leftovers) {
 	print STDERR $leftovers, "\n" or confess $!;
+	$message .= $ignmessage if $honour_ignores;
 	fail $message;
     }
 }
@@ -6229,8 +6230,7 @@ sub clean_tree_check_git_wd ($) {
     return if $cleanmode =~ m{no-check};
     return if $patches_applied_dirtily; # yuk
     clean_tree_check_git +($cleanmode !~ m{all-check}),
-	                  (f_ <<END, $message);
-%s
+	$message, "\n".__ <<END;
 If this is just missing .gitignore entries, use a different clean
 mode, eg --clean=dpkg-source,no-check (-wdn/-wddn) to ignore them
 or --clean=git (-wg/-wgf) to use \`git clean' instead.
@@ -6238,20 +6238,19 @@ END
 }
 
 sub clean_tree_check () {
-    # Not yet fully implemented.
     # This function needs to not care about modified but tracked files.
     # That was done by check_not_dirty, and by now we may have run
     # the rules clean target which might modify tracked files (!)
     if ($cleanmode =~ m{^check}) {
 	clean_tree_check_git +($cleanmode =~ m{ignores}), __
- "tree contains uncommitted files and --clean=check specified";
+ "tree contains uncommitted files and --clean=check specified", '';
     } elsif ($cleanmode =~ m{^dpkg-source}) {
 	clean_tree_check_git_wd __
  "tree contains uncommitted files (NB dgit didn't run rules clean)";
     } elsif ($cleanmode =~ m{^git}) {
-	# If we were actually cleaning these files would be summarily
-	# deleted.  Since we're not, and not using the working tree
-	# anyway, we can just ignore them - nothing will use them.
+	clean_tree_check_git 1, __
+ "tree contains uncommited, untracked, unignored files\n".
+ "You can use --clean=git[-ff],always (-wga/-wgfa) to delete them.", '';
     } elsif ($cleanmode eq 'none') {
     } else {
 	confess "$cleanmode ?";
@@ -6314,10 +6313,12 @@ sub build_prep ($) {
     my ($wantsrc) = @_;
     build_prep_early();
     check_bpd_exists();
-    if (!building_source_in_playtree() || ($wantsrc & WANTSRC_BUILDER)) {
+    if (!building_source_in_playtree() || ($wantsrc & WANTSRC_BUILDER)
 	# Clean the tree because we're going to use the contents of
 	# $maindir.  (We trying to include dirty changes in the source
 	# package, or we are running the builder in $maindir.)
+	|| $cleanmode =~ m{always}) {
+	# Or because the user asked us to.
 	clean_tree();
     } else {
 	# We don't actually need to do anything in $maindir, but we
@@ -7298,12 +7299,10 @@ sub parseopts () {
 		} elsif (s/^-wn$//s) {
 		    push @ropts, $&;
 		    $cleanmode = 'none';
-		} elsif (s/^-wg$//s) {
+		} elsif (s/^-wg(f?)$//s) {
 		    push @ropts, $&;
 		    $cleanmode = 'git';
-		} elsif (s/^-wgf$//s) {
-		    push @ropts, $&;
-		    $cleanmode = 'git-ff';
+		    $cleanmode .= '-ff' if $1;
 		} elsif (s/^-wd(d?)([na]?)$//s) {
 		    push @ropts, $&;
 		    $cleanmode = 'dpkg-source';