diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-09-01 22:19:25 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-09-15 12:57:07 +0100 |
commit | fd0b402409d2f2b04c56bf596d9c387f8cc748f7 (patch) | |
tree | 9229a9623da54de84198385091c5a49eb0bdeb11 | |
parent | 6cda33aa05897023e2a7b300dcbbf04a7d146bb7 (diff) |
wip changes for remote push
-rwxr-xr-x | dgit | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -936,7 +936,8 @@ sub dopush () { # runcmd @git, qw(fetch -p ), "$alioth_git/$package.git", # map { lref($_).":".rref($_) } # (uploadbranch()); - $dsc->{$ourdscfield[0]} = rev_parse('HEAD'); + my $head = rev_parse('HEAD'); + $dsc->{$ourdscfield[0]} = $head; $dsc->save("../$dscfn.tmp") or die $!; if (!$changesfile) { my $multi = "../${package}_".(stripepoch $cversion)."_multi.changes"; @@ -960,6 +961,7 @@ sub dopush () { " does not match changelog \`$clogp->{$field}'"; } my $tag = debiantag($dversion); + runcmd @git, qw(check-ref-format), $tag; if (!check_for_git()) { create_remote_git_repo(); } @@ -974,11 +976,15 @@ sub dopush () { if (!defined $keyid) { $keyid = access_cfg('keyid','RETURN-UNDEF'); } - my @tag_cmd = (@git, qw(tag -s -m), + my @tag_cmd = (@git, qw(tag -a -m), "$package release $dversion for $csuite [dgit]"); - push @tag_cmd, qw(-u),$keyid if defined $keyid; push @tag_cmd, $tag; runcmd_ordryrun @tag_cmd; + + + push @tag_cmd, qw(-u),$keyid if defined $keyid; + push @tag_cmd, qw(-u),$keyid if defined $keyid; + my @debsign_cmd = @debsign; push @debsign_cmd, "-k$keyid" if defined $keyid; push @debsign_cmd, $changesfile; |