X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=079e5dec7c212c0c4ea1be9ecb76f4891af75cfb;hp=366c4566fc52f295957919a1e1039e97650f8dab;hb=1647f63f87eb287027d685d22c6a798aa775ebd1;hpb=395e3a0f5c1d2541a84ac6105f02c7eac34f434b

diff --git a/dgit b/dgit
index 366c4566..079e5dec 100755
--- a/dgit
+++ b/dgit
@@ -1823,7 +1823,6 @@ sub dopush ($) {
     my $tag_obj_hash = cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
     runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
     runcmd_ordryrun_local @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
-    runcmd_ordryrun @git, qw(tag -v --), $tag;
 
     if (!check_for_git()) {
 	create_remote_git_repo();
@@ -2636,6 +2635,8 @@ sub clean_tree () {
 	runcmd_ordryrun_local @dpkgbuildpackage, qw(-T clean);
     } elsif ($cleanmode eq 'git') {
 	runcmd_ordryrun_local @git, qw(clean -xdf);
+    } elsif ($cleanmode eq 'git-ff') {
+	runcmd_ordryrun_local @git, qw(clean -xdff);
     } elsif ($cleanmode eq 'none') {
     } else {
 	die "$cleanmode ?";
@@ -2872,7 +2873,7 @@ sub parseopts () {
 	    } elsif (m/^--build-products-dir=(.*)/s) {
 		push @ropts, $_;
 		$buildproductsdir = $1;
-	    } elsif (m/^--clean=(dpkg-source|git|none)$/s) {
+	    } elsif (m/^--clean=(dpkg-source|git|git-ff|none)$/s) {
 		push @ropts, $_;
 		$cleanmode = $1;
 	    } elsif (m/^--clean=(.*)$/s) {
@@ -2944,6 +2945,9 @@ sub parseopts () {
 		} elsif (s/^-wg$//s) {
 		    push @ropts, $&;
 		    $cleanmode = 'git';
+		} elsif (s/^-wgf$//s) {
+		    push @ropts, $&;
+		    $cleanmode = 'git-ff';
 		} elsif (s/^-wd$//s) {
 		    push @ropts, $&;
 		    $cleanmode = 'dpkg-source';