git-debpush: check_treesame: Show diffstat when there is a diff

[dgit.git] / infra / dgit-repos-server

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index 177829e9aeffce5ccd60a3e9a832f427c1623fa5..4c7e031005df623df5edf996da7ccf4e51c0be53 100755 (executable)
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -3,7 +3,7 @@
 #
 # git protocol proxy to check dgit pushes etc.
 #
-# Copyright (C) 2014-2016  Ian Jackson
+# Copyright (C) 2014-2017,2019  Ian Jackson
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -591,7 +591,8 @@ sub parsetag_general ($$) {
                if ($dgititemfn->()) {
                } elsif (s/^distro\=(\S+) //) {
                    $distrofn->($1);
-               } elsif (s/^[-+.=0-9a-z]\S* //) {
+               } elsif (s/^([-+.=0-9a-z]\S*) //) {
+                   printdebug " parsetag ignoring unrecognised \`$1'\n";
                } else {
                    die "unknown dgit info in tag ($_)";
                }
@@ -1213,7 +1214,7 @@ END
            $upstreamc = $1;
        } elsif (s/^upstream-tag=(\S+) //) {
            $upstreamt = $1;
-       } elsif (s/^quilt=([-+0-9a-z]+) //) {
+       } elsif (s/^--quilt=([-+0-9a-z]+) //) {
            $quilt = $1;
        } else {
            return 0;
@@ -1284,7 +1285,7 @@ END
        if ($quilt =~ m/baredebian/) {
            die "needed upstream commmitish with --quilt=baredebian"
                unless defined $upstreamc;
-           push @dgitcmd, "--upstream-commitish=$upstreamc";
+           push @dgitcmd, "--upstream-commitish=refs/tags/$upstreamt";
        }
     }
     push @dgitcmd, qw(push-source --new --overwrite), $suite;